merged lp:~donkult/apt/sid
authorMichael Vogt <mvo@debian.org>
Tue, 8 Feb 2011 11:57:42 +0000 (12:57 +0100)
committerMichael Vogt <mvo@debian.org>
Tue, 8 Feb 2011 11:57:42 +0000 (12:57 +0100)

Trivial merge