Merge http://git.sxemacs.org/sxemacs
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 14 Sep 2011 01:01:04 +0000 (21:01 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 14 Sep 2011 01:01:04 +0000 (21:01 -0400)

Trivial merge