merged from debian-sid

diff --cc debian/changelog
index a712d00ac33aa8872814c26e3af0f8ec2569d826,03bbe86d42a669aedb574db4463d2d06a2776a40..46d677421b612223dfe58debe0abce10610226e6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,39 +1,51 @@@
- apt (0.8.13.2) unstable; urgency=low
++apt (0.8.13.3) 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.2) unstable; urgency=low
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - skip --configure if all packages disappeared
+   * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
+     - mark them as deprecated as they are unused
+   * apt-pkg/deb/deblistparser.h:
+     - enable StripMultiArch by default for ParseDepends
+   * debian/apt.conf.autoremove:
+     - adapt to new gnumach kernel package naming (Closes: #619337)
+   * doc/apt_preferences.5.xml:
+     - correct typo spotted by Charles Plessy (Closes: #619088)
+     - document ButAutomaticUpgrades together with NotAutomatic
+       as suggested by Charles Plessy (Closes: #619083)
+   * apt-pkg/depcache.cc:
+     - remove pseudo handling leftover from SetReInstall
+     - do not change protected packages in autoinstall (Closes: #618848)
+   * apt-pkg/pkgcachegen.cc:
+     - make "all"->"native" an implementation detail of NewPackage
+       rather than rewrite it in higher methods
+   * apt-pkg/cacheiterator.h:
+     - return "all" instead of native architecture without breaking the abi
+       (too much) by extending enum instead of using bitflags (LP: #733741)
+   * apt-pkg/aptconfiguration.cc:
+     - use dpkg --print-foreign-architectures to get multiarch configuration
+       if non is specified with APT::Architectures (Closes: #612958)
+   * cmdline/apt-get.cc:
+     - do not show simulation notice for non-root commands (Closes: #619072)
+     - be able to disable resolver with APT::Get::CallResolver and disable
+       auto installation with APT::Get::AutoSolving
+   * apt-pkg/deb/deblistparser.cc:
+     - create foo:any provides for all architectures for an allowed package
+ 
+  -- Michael Vogt <mvo@debian.org>  Tue, 05 Apr 2011 09:40:28 +0200
+ 
  apt (0.8.13.1) unstable; urgency=low
  
    * apt-pkg/acquire-item.cc: Use stat buffer if stat was