merge debian sid branch
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 10 Dec 2009 16:11:28 +0000 (17:11 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 10 Dec 2009 16:11:28 +0000 (17:11 +0100)

Trivial merge