merged from debian-experimental2

diff --cc debian/changelog
index d0619f2da8e23431b91e06d888a3c468e328c5dd,06c84f31c02d219e2d93b02003f1645c72f31b9e..964df30d495e23a5b25781ead5128aeb96c5ac97
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,11 @@@
-     - header reshuffling that may cause FTBFS
 +apt (0.8.16~exp9ubuntu1) UNRELEASED; urgency=low
 +
 +  * merge from debian/experimental:
 +    - new ABI
 +  * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2011 16:51:36 +0100
 +
  apt (0.8.16~exp9) UNRELEASED; urgency=low
  
    [ Julian Andres Klode ]
@@@ -45,6 -35,9 +44,8 @@@
      - drop the explicit export of gz-compression handling
    * apt-pkg/cdrom.cc:
      - support InRelease files on cdrom
 -  
+   [ Michael Vogt ]
+   * g++ 4.7 fixes
  
   -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 11 Dec 2011 19:34:58 +0100
  

diff --cc doc/apt-key.8.xml
Simple merge