Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Wed, 27 Jul 2011 00:40:58 +0000 (20:40 -0400)
committerRalph Amissah <ralph@amissah.com>
Wed, 27 Jul 2011 00:40:58 +0000 (20:40 -0400)

Trivial merge