Merge branch 'master' of http://git.sxemacs.org/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 2 Dec 2011 14:49:18 +0000 (09:49 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Fri, 2 Dec 2011 14:49:18 +0000 (09:49 -0500)

Trivial merge