merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 29 Jun 2011 10:15:35 +0000 (11:15 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 29 Jun 2011 10:15:35 +0000 (11:15 +0100)

Trivial merge