merged sftp://bzr.debian.org/bzr/apt/apt/debian-sid

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

diff --cc apt-pkg/indexcopy.cc
Simple merge

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc debian/changelog
index 48c08a1e061e30e8334ba8c8ffd6d2f9de6ef230,e62f0b68141e39d89705c04b72a93abdda538155..7ee04b21b81d8394629daa698e2b37ddd3525969
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,3 +1,30 @@@
-   Merged from lp:~donkult/apt/experimental
 +apt (0.9.7.5ubuntu2) UNRELEASED; urgency=low
 +
++  Merged from lp:~donkult/apt/experimental, 
++              sftp://bzr.debian.org/bzr/apt/apt/debian-sid
 +  
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +  
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - merge fix for LP: #346386 
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +
 +apt (0.9.7.5ubuntu1) quantal; urgency=low
 +
 +  [ Michael Vogt ]
 +  * merged latest fixes from the debian-sid branch
 +  
 +  [ TJ ]
 +  * apt-pkg/contrib/netrc.cc:
 +    - increase LOGINSIZE/PASSWORDSIZE limits and add proper error
 +      if the limits are reached (LP: #1008289)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Aug 2012 12:06:48 +0200
 +
  apt (0.9.7.5) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]

diff --cc debian/control
Simple merge

diff --cc doc/po/apt-doc.pot
Simple merge

diff --cc doc/po/de.po
Simple merge

diff --cc doc/po/es.po
Simple merge

diff --cc doc/po/fr.po
Simple merge

diff --cc doc/po/it.po
Simple merge

diff --cc doc/po/ja.po
Simple merge

diff --cc doc/po/pl.po
Simple merge

diff --cc doc/po/pt.po
Simple merge

diff --cc doc/po/pt_BR.po
Simple merge

diff --cc test/integration/framework
Simple merge