merged from the debian-sid branch

diff --cc debian/changelog
index 1c24a6b29ef8494f1830341c29b7753285b5f867,47b1eefae623cee2531897b83b9d0e3c2c8cdcc3..08115765c15ce54889b15dbd94c8f88d6386e495
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,20 @@@
- apt (0.8.2ubuntu1) maverick; urgency=low
++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
+ 
+   [ Manpages translations ]
+   * Japanese (KURASAWA Nozomu). Closes: #595862
+ 
+   [ Michael Vogt ]
    * apt-pkg/indexcopy.cc:
      - only use trusted.gpg.d directory if it exists
      - do not replace /dev/null when running in APT::CDROM::NoAct