merge from debian-sid

diff --cc debian/changelog
index d19ab59e69d49e06615539528658061721581672,1eeb99b9837cb1f59ec9228df4d7196523212ded..746ee59245293606cae349a77c009c0ff3e17e90
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
- apt (0.8.15.4) UNRELEASEDunstable; urgency=low
 +apt (0.8.15.4ubuntu1) UNRELASED; urgency=low
 +
 +  * merged from debian-sid
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2011 12:24:59 +0200
 +
+ apt (0.8.15.4) unstable; urgency=low
  
    [ David Miller ]
    * apt-pkg/contrib/sha1.cc: