Merge branch 'master' of http://git.sxemacs.org/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Tue, 11 Oct 2011 21:19:36 +0000 (17:19 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Tue, 11 Oct 2011 21:19:36 +0000 (17:19 -0400)

Trivial merge