Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid
authorMichael Vogt <mvo@debian.org>
Sun, 1 Sep 2013 16:33:26 +0000 (18:33 +0200)
committerMichael Vogt <mvo@debian.org>
Sun, 1 Sep 2013 16:33:26 +0000 (18:33 +0200)

Trivial merge