Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Thu, 15 Sep 2011 05:49:06 +0000 (15:49 +1000)
committerSteve Youngs <steve@sxemacs.org>
Thu, 15 Sep 2011 05:49:06 +0000 (15:49 +1000)

Trivial merge