Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Fri, 11 Sep 2009 21:10:58 +0000 (17:10 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 11 Sep 2009 21:10:58 +0000 (17:10 -0400)

Trivial merge