* merged from debian/sid, this adds important fixes in the

  apt mirror method
* mirror method:
  - when downloading data, show the mirror being used
  - randomize mirror list after download in a host specific way
    to ensure that the load is evenly spreaded accross the mirrors
  - fix some missing "Fail-Ignore"

diff --cc debian/changelog
index ae50ad20c2e28c089f8b006eaa6cda93370716c6,c7bb429ff963b6d2efaccabe3b36f42fc3d4b047..84151715ae7fb57d6999e84e895d372b4db08a20
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,11 @@@
- apt (0.8.13) UNRELEASED; urgency=low
++apt (0.8.13ubuntu1) UNRELEASED; urgency=low
++
++  * merged from debian/sid, this adds important fixes in the
++    apt mirror method
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 08:23:19 +0100
++
+ apt (0.8.13) unstable; urgency=low
  
    [ Thorsten Spindler ]
    * methods/rsh.cc
@@@ -11,32 -11,14 +18,37 @@@
        user to insert the CD on each apt-get update
    * po/sl.po:
      - updated, thanks to Andrej Znidarsic
+   * mirror method:
+     - when downloading data, show the mirror being used
+     - randomize mirror list after download in a host specific way
+       to ensure that the load is evenly spreaded accross the mirrors
+     - fix some missing "Fail-Ignore"
  
-  -- Michael Vogt <mvo@debian.org>  Mon, 14 Mar 2011 13:17:08 +0100
+  -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
  
 +apt (0.8.12ubuntu2) unstable; urgency=low
 +
 +  [ Thorsten Spindler ]
 +  * methods/rsh.cc
 +    - fix rsh/ssh option parsing (LP: #678080), thanks to
 +      Ville Mattila 
 +  
 +  [ Michael Vogt ]
 +  * apt-pkg/acquire-item.cc:
 +    - mark pkgAcqIndexTrans as Index-File to avoid asking the
 +      user to insert the CD on each apt-get update
 +  * methods/mirror.cc:
 +    - improve debug output and fix bug in TryNextMirror
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
 +
 +apt (0.8.12ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the udev based
 +    cdrom handling and multiarch handling
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 16:12:22 +0100
 +
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]