Merge http://git.sxemacs.org/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 16 Sep 2011 12:46:50 +0000 (08:46 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 16 Sep 2011 12:46:50 +0000 (08:46 -0400)

Trivial merge