Merge branch 'master' of http://git.sxemacs.org/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 17 Sep 2011 03:02:59 +0000 (23:02 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sat, 17 Sep 2011 03:02:59 +0000 (23:02 -0400)

Trivial merge