merged from donkult

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/depcache.cc
Simple merge

diff --cc debian/changelog
index 7ed580d3f2f787ba040d861d9e058ddb7cf4c89a,5eb4e593fd6233acfb3a044ff6b0d9cfb4f09638..e524081c8972a0d061f43fe731e0da15ee6eae46
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -4,17 -4,14 +4,22 @@@ apt (0.8.16~exp10) UNRELEASED; urgency=
    * apt-pkg/depcache.cc:
      - implicit conflicts (for multiarch) are supposed to conflict
        only with real packages, not with virtual providers
+   * apt-pkg/pkgcache.cc:
+     - ignore implicit conflicts on providers in AllTarget, too
+   * apt-pkg/deb/dpkgpm.cc:
+     - check if dpkg supports multiarch with --assert-multi-arch
+       and if it does be always explicit about the architecture
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 11 Jan 2012 17:59:33 +0100
+  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 13 Jan 2012 17:29:07 +0100
  
 +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 ]