merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 09:15:29 +0000 (10:15 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 09:15:29 +0000 (10:15 +0100)

Trivial merge