merge with the final changelog from debian-sid

debian/changelog

@@ -1,4 +1,4 @@
-apt (0.8.15.5.6+nmu1) UNRELEASED; urgency=low
+apt (0.8.15.7) UNRELEASED; urgency=low
 
   [ David Kalnischkies ]
   * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
@@ -8,7 +8,7 @@ apt (0.8.15.5.6+nmu1) UNRELEASED; urgency=low
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 17 Aug 2011 11:08:02 +0200
 
-apt (0.8.15.5.6) UNRELEASED; urgency=low
+apt (0.8.15.6) unstable; urgency=low
 
   [ Michael Vogt ]
   * apt-pkg/contrib/fileutl.{cc,h}:
@@ -32,7 +32,7 @@ apt (0.8.15.5.6) UNRELEASED; urgency=low
   [ David Kalnischkies ]
   * lots of cppcheck fixes
 
- -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 09:20:35 +0200
 
 apt (0.8.15.5) unstable; urgency=low