merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 14 Jul 2011 09:20:28 +0000 (11:20 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 14 Jul 2011 09:20:28 +0000 (11:20 +0200)

Trivial merge