merge from the debian-sid branch

diff --cc debian/changelog
index 6ea803fcb4a64cc49125c9f5549eefaafb9ebf90,e17ee702b976315719edf9078bf3b982b1456bb4..661610f790a0a802bbea5a362333a30ad00af256
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,4 +1,18 @@@
- apt (0.9.5) UNRELEASED; urgency=low
 +apt (0.9.5ubuntu1) UNRELEASED; urgency=low
 +
 +  * merged from debian, remaining changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +    - APT::pkgPackageManager::MaxLoopCount set to 5000
 +    - apport pkgfailure handling
 +    - patch for apt cross-building, see http://bugs.debian.org/666772
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 May 2012 15:57:26 +0200
 +
+ apt (0.9.5) unstable; urgency=low
  
    [ Chris Leick ]
    * proofreading of the manpage pot

diff --cc doc/po/apt-doc.pot
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