merge with debian-sid to get final 0.8.4

diff --cc debian/changelog
index 269113ad3a9fe1b3c25190512e707cbcb9511145,1e98b4d83e560e4287aac4bc6d118eaa01b26fb5..174a263a9f7a716b07e08d181b736c1613055324
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,4 +1,15 @@@
- apt (0.8.4) UNRELEASED; urgency=low
 +apt (0.8.5) UNRELEASED; urgency=low
 +
 +  [ 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
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 14 Sep 2010 18:56:23 +0200
 +
+ apt (0.8.4) unstable; urgency=low
  
    [ Michael vogt ]
    * ftparchive/writer.cc: