Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Sat, 28 Jul 2007 00:35:01 +0000 (01:35 +0100)
committerRalph Amissah <ralph@amissah.com>
Sat, 28 Jul 2007 00:35:01 +0000 (01:35 +0100)

Trivial merge