Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git...
authorBernie Innocenti <bernie@codewiz.org>
Sun, 30 Nov 2008 19:12:54 +0000 (14:12 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Sun, 30 Nov 2008 19:12:54 +0000 (14:12 -0500)

Trivial merge