merged from lp:~donkult/apt/sid

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 1ceeebfc540634a9ed874d6b63700ad488b0f49f,c32edc4adb986138c239e41f9113ed733ec74d44..18b59ec4e5747d67a9d257fc9eb1e422540d8777
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--apt (0.8.15.3) UNRELEASED; urgency=low
++apt (0.8.15.3) unstable; urgency=low
  
    [ Michael Vogt ]
    * apt-pkg/acquire-item.cc:
@@@ -32,8 -32,15 +34,15 @@@
      - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
    * apt-pkg/policy.cc:
      - emit an error on unknown APT::Default-Release value (Closes: #407511)
+   * apt-pkg/aptconfiguration.cc:
+     - ensure that native architecture is if not specified otherwise the
+       first architecture in the Architectures vector
+   * apt-pkg/deb/deblistparser.cc:
+     - Strip only :any and :native if MultiArch should be stripped as it is
+       save to ignore them in non-MultiArch contexts but if the dependency
+       is a specific architecture (and not the native) do not strip
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jul 2011 16:43:37 +0200
 - -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 25 Jul 2011 14:40:00 +0200
++ -- Michael Vogt <mvo@debian.org>  Mon, 25 Jul 2011 15:04:43 +0200
  
  apt (0.8.15.2) unstable; urgency=high