merged from donkult
authorMichael Vogt <mvo@debian.org>
Mon, 4 Oct 2010 09:51:47 +0000 (11:51 +0200)
committerMichael Vogt <mvo@debian.org>
Mon, 4 Oct 2010 09:51:47 +0000 (11:51 +0200)

Trivial merge