Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Fri, 27 Nov 2009 21:56:20 +0000 (16:56 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 27 Nov 2009 21:56:20 +0000 (16:56 -0500)

Trivial merge