merge from lp:~donkult/apt/sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 29 Jul 2010 14:31:40 +0000 (16:31 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 29 Jul 2010 14:31:40 +0000 (16:31 +0200)

Trivial merge