Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Fri, 2 Jul 2010 17:56:35 +0000 (13:56 -0400)
committerRalph Amissah <ralph@amissah.com>
Fri, 2 Jul 2010 17:56:35 +0000 (13:56 -0400)

Trivial merge