Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Sun, 20 Dec 2009 02:59:50 +0000 (21:59 -0500)
committerRalph Amissah <ralph@amissah.com>
Sun, 20 Dec 2009 02:59:50 +0000 (21:59 -0500)

Trivial merge