merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index d1e636a32005c3e68464b755cdd74276f887f0e0,fc883dc0d40088069c2ef7093fe5d322f427ef5e..3d63fb64e5cddab627a82ca497707b0a0501fd88
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,3 +1,21 @@@
 +apt (0.8.13ubuntu2) UNRELEASED; urgency=low
 +
 +  * po/makefile:
 +    - add hack to run MSGMERGE again if it segfaults. this is to help
 +      powerpc to bootstrap
++  * mirror method:
++    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
++    - do not crash if the mirror file fails to download
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 16 Mar 2011 20:39:21 +0100
 +
 +apt (0.8.13ubuntu1) natty; 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 ]