merge with debian-sid to get final 0.8.4

diff --combined debian/changelog
index 269113ad3a9fe1b3c25190512e707cbcb9511145,1e98b4d83e560e4287aac4bc6d118eaa01b26fb5..174a263a9f7a716b07e08d181b736c1613055324
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,14 +1,25 @@@
- 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:
      - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
        available LP: #633967. Thanks to Colin Watson
+   * apt-pkg/contrib/cdromutl.cc:
+     - if apt-cdrom is used on writable media (like usb-sticks), do
+       not use the root directory to identify the medium (as all 
+       changes there change the ident id). Use the .disk directory 
+       instead 
  
    [ David Kalnischkies ]
    * ftparchive/writer.cc:
@@@ -22,10 -16,17 +27,17 @@@
    * apt-pkg/acquire-item.cc:
      - use also unsigned Release files again (Closes: #596189)
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
+   [ Christian Perrier ]
+   * Fix missing space after dot in a message from apt-pkg
+     Translations unfuzzied. Thanks to Holger Wansing.
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 10 Sep 2010 20:45:15 +0200
  
  apt (0.8.3) unstable; urgency=low
  
+   [ Programs translations ]
+   * German (Holger Wansing). Closes: #596141
+ 
    [ Manpages translations ]
    * Japanese (KURASAWA Nozomu). Closes: #595862