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

Trivial merge