Merge http://git.nelsonferreira.com/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 17 Sep 2011 03:38:49 +0000 (23:38 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 17 Sep 2011 03:38:49 +0000 (23:38 -0400)

Trivial merge