merged from lp:~mvo/apt/mvo
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 31 Jan 2012 10:22:24 +0000 (11:22 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 31 Jan 2012 10:22:24 +0000 (11:22 +0100)

Trivial merge