Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Tue, 1 Feb 2011 21:55:53 +0000 (16:55 -0500)
committerRalph Amissah <ralph@amissah.com>
Tue, 1 Feb 2011 21:55:53 +0000 (16:55 -0500)

Trivial merge