Merge branch 'upstream'
authorGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:38:19 +0000 (21:38 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 14 Jul 2010 19:38:19 +0000 (21:38 +0200)

Trivial merge