Merge branch 'upstream'
authormwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sat, 26 Jan 2008 00:17:49 +0000 (19:17 -0500)
committermwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sat, 26 Jan 2008 00:17:49 +0000 (19:17 -0500)

Trivial merge