Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Mon, 18 Apr 2011 23:30:01 +0000 (09:30 +1000)
committerSteve Youngs <steve@sxemacs.org>
Mon, 18 Apr 2011 23:30:01 +0000 (09:30 +1000)

Trivial merge