Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Wed, 14 Sep 2011 04:26:44 +0000 (14:26 +1000)
committerSteve Youngs <steve@sxemacs.org>
Wed, 14 Sep 2011 04:26:44 +0000 (14:26 +1000)

Trivial merge