Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Tue, 2 Nov 2010 02:29:03 +0000 (22:29 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Tue, 2 Nov 2010 02:29:03 +0000 (22:29 -0400)

Trivial merge