merged from debian-experiemental

diff --cc debian/changelog
index 964df30d495e23a5b25781ead5128aeb96c5ac97,a1b93a98181d2bde3d94912b93ea751dbee37288..e64ee60266cb3c415bd2493e967f0b7e6ce76113
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,4 +1,12 @@@
- apt (0.8.16~exp9) UNRELEASED; urgency=low
 +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) experimental; urgency=low
  
    [ Julian Andres Klode ]
    * apt-pkg/cdrom.cc: