merged mvo branch

diff --cc debian/changelog
index b785b91d74f418c92eed73ac68b3b9906c85a8ba,a712d00ac33aa8872814c26e3af0f8ec2569d826..20a37dcc54ba055728e0f6292d7142b2d2013b5e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,22 +1,34 @@@
 -apt (0.8.13.2) unstable; urgency=low
++apt (0.8.13.1ubuntu1) natty; urgency=low
+ 
 -  [ Thorsten Spindler ]
 -  * debian/zzapt.cron.daily:
 -    - move cron job to the end of execution (LP: #727685)
++  * merged fixes from the debian-sid
+   
 -  [ 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.13ubuntu2) natty; 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>  Thu, 24 Mar 2011 18:01:38 +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 ]