merged from lp:~mvo/apt/mvo

diff --cc apt-pkg/deb/deblistparser.cc
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc debian/changelog
index c8a4f44770788a8b65fe773a92cce76bcf0aefdc,16c0990d9d81825e35e11463d1fa226822c3cca4..6ba17d067b6bfe03c5044e60e808dc67e0befd26
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -77,16 -73,24 +77,32 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo
    * apt-pkg/packagemanager.cc:
      - ensure for Multi-Arch:same packages that they are unpacked in
        lock step even in immediate configuration (Closes: #618288)
 -  
 +  * apt-pkg/init.cc:
 +    - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
 +  * cmdline/apt-config.cc:
 +    - show Acquire::Languages and APT::Architectures settings
 +      in 'dump' (Closes: 626739)
 +  * apt-pkg/orderlist.cc:
 +    - ensure that an old version of a package with a provides can
 +      never satisfy a dependency of a newer version of this package
 +
+   [ Michael Vogt ]
+   * methods/mirror.cc:
+     - ignore lines starting with "#" in the mirror file
+     - ignore non http urls in the mirrors
+     - append the dist (e.g. sid, wheezy) as a query string when
+       asking for a suitable mirror 
+   * apt-pkg/deb/deblistparser.cc:
+     - include all known languages when building the apt cache
+       (LP: #794907)
+   * apt-pkg/deb/debindexfile.cc:
+     - remove some no longer valid checks for "TranslationsAvailable()"
+ 
+   [ Kenneth Solbø Andersen ]
+   * apt-pkg/deb/dpkgpm.cc:
+     - set permissions of term.log to root.adm and 644 (LP: #404724)
+ 
 - -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
 + -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 28 May 2011 10:54:23 +0200
  
  apt (0.8.14.1) unstable; urgency=low