merged from the lp:~mvo/apt/mvo branch

diff --cc debian/changelog
index a783fdaae4db944dc74ecad836677e9adb4d0818,a354c9f8c57be353e4f71826cc69a250d1a9b2cc..21a5cc6d804678afd76727587ca185f125f7870e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,16 +1,33 @@@
- apt (0.8.10.4) UNRELEASED; urgency=low
 -apt (0.8.10) unstable; urgency=low
++apt (0.8.11) unstable; urgency=low
  
+   [ Michael Vogt ]
+   * methods/http.cc:
+     - do not hang if Acquire::http::ProxyAutoDetect can not be
+       executed or returns no data (LP: #654393)
 +  * debian/apt.conf.autoremove:
 +    - never autoremove the GNU/Hurd kernel (closes: #588423), thanks
 +      to Guillem Jover
 +  * apt-pkg/cdrom.cc, apt-pkg/init.cc, methods/cdrom.cc:
 +    - use /media/cdrom as default mountoint (closes: #611569)
  
+   [ Martin Pitt ]
+   * test/integration/test-compressed-indexes, test/test-indexes.sh:
+     - Explicitly disable compressed indexes at the start. This ensures that we
+       will actually test uncompressed indexes regardless of the internal
+       default value of Acquire::GzipIndexes.
+ 
 + -- Michael Vogt <mvo@debian.org>  Tue, 01 Feb 2011 09:38:48 +0100
 +
 +apt (0.8.10.3) unstable; urgency=low
 +
 +  [ Programs translations ]
 +  * po/es.po: Updated, plus fixes encoding issues and fixes two fuzzy
 +    strings, thanks to Javier Fernandez-Sanguino (closes: #610692)
 +
 + -- Michael Vogt <mvo@debian.org>  Tue, 25 Jan 2011 11:51:42 +0100
 +
 +apt (0.8.10.2) unstable; urgency=low
 +
    [ David Kalnischkies ]
    * ftparchive/apt-ftparchive.cc:
      - fix endless loop for multiple TranslationsWriters