merged from lp:~mvo/apt/mvo

diff --cc apt-pkg/acquire.cc
Simple merge

diff --cc debian/changelog
index 000459c5cf7e525e98609b6c1341f69cf6501765,3d9bdb31f1f05759b78dffc958a0dee0f9580740..3c40d13c0e63a09d54fc9563e734088b580e8465
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,5 +1,6 @@@
--apt (0.8.16~exp5) experimental; urgency=low
++apt (0.8.16~exp5) UNRELEASEDexperimental; urgency=low
  
 +  * merged the latest debian-sid fixes
    * apt-pkg/makefile:
      - install sha256.h compat header
    * apt-pkg/pkgcachegen.{cc,h}:

diff --cc methods/mirror.cc
Simple merge