Merge branch 'upstream'
authorGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:47 +0000 (22:36 +0100)
committerGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:47 +0000 (22:36 +0100)

Trivial merge