Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/wiki
authorBernie Innocenti <bernie@codewiz.org>
Fri, 27 Nov 2009 21:55:38 +0000 (16:55 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 27 Nov 2009 21:55:38 +0000 (16:55 -0500)

Trivial merge