Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Sun, 23 Sep 2007 04:16:53 +0000 (05:16 +0100)
committerRalph Amissah <ralph@amissah.com>
Sun, 23 Sep 2007 04:16:53 +0000 (05:16 +0100)

Trivial merge