Merge branch 'upstream' into debian debian/0.60.1-1
authormwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sat, 26 Jan 2008 00:07:15 +0000 (19:07 -0500)
committermwolson_admin <mwolson_admin@deleuze.hcoop.net>
Sat, 26 Jan 2008 00:07:15 +0000 (19:07 -0500)

Trivial merge