Merge branch 'sppm-update'
authorHorst Günther Burkhardt III <horst@sxemacs.org>
Mon, 15 Nov 2010 00:28:17 +0000 (11:28 +1100)
committerHorst Günther Burkhardt III <horst@sxemacs.org>
Mon, 15 Nov 2010 00:28:17 +0000 (11:28 +1100)

Trivial merge