Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Tue, 21 Jun 2011 02:13:11 +0000 (12:13 +1000)
committerSteve Youngs <steve@sxemacs.org>
Tue, 21 Jun 2011 02:13:11 +0000 (12:13 +1000)

Trivial merge