merged from lp:~donkult/apt/sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jul 2011 09:57:16 +0000 (11:57 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jul 2011 09:57:16 +0000 (11:57 +0200)

Trivial merge