Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Tue, 13 Apr 2010 11:12:54 +0000 (07:12 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Tue, 13 Apr 2010 11:12:54 +0000 (07:12 -0400)

Trivial merge