Merge branch 'upstream' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Sat, 6 Mar 2010 14:49:35 +0000 (09:49 -0500)
committerRalph Amissah <ralph@amissah.com>
Sat, 6 Mar 2010 14:49:35 +0000 (09:49 -0500)

Trivial merge