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)
commit432ecdf4a9444ffeee98178829d51fc588911cdd
treeccf1e1d498e83e15eb004e60b9615e2b9af1544e
parent64ff59baf3361c2591d52e52bdddabebfcd21e4c
parentdd184caf1b0d37f50ea0ddcc68822bd38da32105
Merge branch 'upstream' into debian