merged from debian-sid
authorMichael Vogt <mvo@debian.org>
Sat, 25 Oct 2008 08:27:13 +0000 (10:27 +0200)
committerMichael Vogt <mvo@debian.org>
Sat, 25 Oct 2008 08:27:13 +0000 (10:27 +0200)

Trivial merge