merged lp:~donkult/apt/sid

diff --cc debian/changelog
index 9adf730c51e5128da39016b15bc8ca1031c4d24a,174a263a9f7a716b07e08d181b736c1613055324..54e47957daa43b84a6dffe04d4455c396a7df53f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,17 @@@
  apt (0.8.5) UNRELEASED; urgency=low
  
++  [ Michael Vogt ]
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
 +    conflicts/breaks against virtual packages (LP: #614993)
++  
+   [ David Kalnischkies ]
+   * apt-pkg/policy.cc:
+     - support 100-pinning in Release file with ButAutomaticUpgrades
+       as requested by the backports crew (Closes: #596097)
+   * apt-pkg/deb/deblistparser.cc:
+     - overrule NotAutomatic in case of ButAutomaticUpgrades
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Sep 2010 19:53:46 +0200
+  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 14 Sep 2010 18:56:23 +0200
  
  apt (0.8.4) unstable; urgency=low