merged from lp:~donkult/apt/sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Fri, 15 Jul 2011 07:45:33 +0000 (09:45 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Fri, 15 Jul 2011 07:45:33 +0000 (09:45 +0200)

Trivial merge