merged from debian-sid

diff --combined debian/changelog
index fc883dc0d40088069c2ef7093fe5d322f427ef5e,2dacf93f5ee221ed59600bcc128907305ebe75de..a712d00ac33aa8872814c26e3af0f8ec2569d826
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,13 +1,25 @@@
- apt (0.8.13) unstable; urgency=low
++apt (0.8.13.2) unstable; urgency=low
 +
 +  [ Thorsten Spindler ]
 +  * debian/zzapt.cron.daily:
 +    - move cron job to the end of execution (LP: #727685)
++  
++  [ Michael Vogt ]
++  * mirror method:
++    - do not crash if the mirror file fails to download
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
++
+ apt (0.8.13.1) unstable; urgency=low
+ 
+   * apt-pkg/acquire-item.cc: Use stat buffer if stat was
+     successful, not if it failed (Closes: #620546)
+ 
+  -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
+ 
+ apt (0.8.13) unstable; urgency=low
+ 
+   [ Thorsten Spindler ]
    * methods/rsh.cc
      - fix rsh/ssh option parsing (LP: #678080), thanks to
        Ville Mattila 
@@@ -11,13 -16,15 +28,15 @@@
    * apt-pkg/acquire-item.cc:
      - mark pkgAcqIndexTrans as Index-File to avoid asking the
        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 to ensure more even load
-     - merge fix from Matt Zimmerman, many thanks (LP: #741098)
-     - do not crash if the mirror file fails to download
+     - 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 <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
+  -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
  
  apt (0.8.12) unstable; urgency=low