Merge branch 'master' of ssh://mire.hcoop.net/home/mwolson_admin/hcoop-git/misc
authormwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sun, 28 Oct 2007 20:24:24 +0000 (16:24 -0400)
committermwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sun, 28 Oct 2007 20:24:24 +0000 (16:24 -0400)

Trivial merge