merged from lp:~donkult/apt/sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 23 Aug 2010 16:56:03 +0000 (18:56 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 23 Aug 2010 16:56:03 +0000 (18:56 +0200)

Trivial merge