Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Fri, 27 Jul 2007 20:10:22 +0000 (21:10 +0100)
committerRalph Amissah <ralph@amissah.com>
Fri, 27 Jul 2007 20:10:22 +0000 (21:10 +0100)

Trivial merge