Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Wed, 23 Jun 2010 22:18:33 +0000 (18:18 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Wed, 23 Jun 2010 22:18:33 +0000 (18:18 -0400)

Trivial merge