Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:24:08 +0000 (20:24 +0100)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 17 Feb 2010 19:24:08 +0000 (20:24 +0100)

Trivial merge