Merge branch 'emailed-patches'
authorSteve Youngs <steve@sxemacs.org>
Tue, 25 Oct 2011 00:11:33 +0000 (10:11 +1000)
committerSteve Youngs <steve@sxemacs.org>
Tue, 25 Oct 2011 00:11:33 +0000 (10:11 +1000)

Trivial merge