merged from debian-sid

diff --cc debian/changelog
index 64d37ba96ab2dc64318a32876a4b544de8eb5923,6ea08c042b0b3d72176814448e34e437f9693223..64b8a20735ee4604c8b65f8eedcf982edd042a30
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,27 +1,45 @@@
 -apt (0.8.4) UNRELEASED; urgency=low
 +apt (0.8.3ubuntu2) UNRELEASEDmaverick; urgency=low
  
 -  [ Michael vogt ]
++  * merged fixes from debian-sid
++  
++  [ 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:
+     - null the valid string instead of the date if Valid-Until is not set
+   * apt-pkg/acquire-item.cc:
+     - use also unsigned Release files again (Closes: #596189)
+ 
+   [ Christian Perrier ]
+   * Fix missing space after dot in a message from apt-pkg
+     Translations unfuzzied. Thanks to Holger Wansing.
+ 
   -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
  
 +apt (0.8.3ubuntu1) maverick; urgency=low
 +
 +  * merged fixes from debian-sid
 +  * debian/rules:
 +    - put ubuntu-archive.gpg back into the package (LP: #620576)
 +  * apt-pkg/init.cc:
 +    - ignore ".distUpgrade" and ".save" files in sources.list.d
 +      (LP: #631770)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Sep 2010 09:27:24 +0200
 +
  apt (0.8.3) unstable; urgency=low
  
+   [ Programs translations ]
+   * German (Holger Wansing). Closes: #596141
+ 
    [ Manpages translations ]
    * Japanese (KURASAWA Nozomu). Closes: #595862