Merge branch 'master' of ssh://mire.hcoop.net/home/mwolson_admin/hcoop-git/misc
authormwolson_admin <mwolson_admin@deleuze.hcoop.net>
Thu, 13 Mar 2008 01:59:05 +0000 (21:59 -0400)
committermwolson_admin <mwolson_admin@deleuze.hcoop.net>
Thu, 13 Mar 2008 01:59:05 +0000 (21:59 -0400)

Trivial merge