Merge branch 'master' of ssh://bernie@sunjammer.codewiz.org/~/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Tue, 8 Dec 2009 22:50:53 +0000 (17:50 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Tue, 8 Dec 2009 22:50:53 +0000 (17:50 -0500)

Trivial merge