merged from lp:~donkult/apt/experimental

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

diff --cc debian/changelog
index c49c56bca7a3beb87b6e40b977edb9b1a37449ab,83704caeb88e15a7993fcb5b6a471c7426eaee61..7ed580d3f2f787ba040d861d9e058ddb7cf4c89a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
+ apt (0.8.16~exp10) UNRELEASED; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/depcache.cc:
+     - implicit conflicts (for multiarch) are supposed to conflict
+       only with real packages, not with virtual providers
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 11 Jan 2012 17:59:33 +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 ]