merge with debian-sid

diff --cc debian/changelog
index c7aead5bb64bb5efa2c92399f2c49fcf33e3f06b,739f1b425634764f6efaa153e77771ac4e532585..9126e9dc38b1bffc252799af9fc8b6b9736b91c8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,14 -5,28 +5,34 @@@ apt (0.8.7) UNRELEASED; urgency=lo
    * Another typo fixed in French ("Anfin"). Thanks to bubulle
    * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog
      Closes: #599265
+   
+   [ Michael Vogt ]
+   * debian/apt.cron.daily:
+     - source /etc/default/locale (if available) so that the 
+       apt-get update cron job fetches the right translated package
+       descriptions
+   * fix test failure on amd64
+   * apt-pkg/deb/debsystem.cc:
+     - fix issues with dir::state::status and dir::state::extended_states
+       when alternative rootdirs are used
+ 
+   [ Martin Pitt ]
+   * apt-pkg/deb/debindexfile.cc:
+     - Use FileFd::Size() instead of stat()ing the sources/binary/translations
+       indexes directly, so that we have transparent handling of gzipped
+       indexes.
+   * apt-pkg/contrib/fileutl.cc:
+     - Fix FileFd::Size() for gzipped files to give the size of the
+       uncompressed data. This fixes cache building progress going way
+       over 100%.
  
 - -- Christian Perrier <bubulle@debian.org>  Tue, 05 Oct 2010 05:35:58 +0200
 +  [ David Kalnischkies ]
 +  * apt-pkg/deb/deblistparser.cc:
 +    - support ArmHardFloat port in CompleteArch, thanks to Sebastian
 +      Andrzej Siewior for the patch!
 +
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 07 Oct 2010 14:46:59 +0200
  
  apt (0.8.6) unstable; urgency=low