Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git...
authorBernie Innocenti <bernie@codewiz.org>
Mon, 1 Dec 2008 00:26:44 +0000 (19:26 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Mon, 1 Dec 2008 00:26:44 +0000 (19:26 -0500)

Trivial merge