merged from debian

diff --cc debian/changelog
index 4edc80ac316fcc4ec83b34d5c6dfc97f7e3ac5ac,c0cc77c29278ab9c9619529875d4fcfb98e47d31..5048dd9ddf5f3fc5d2806b61ceca6175347cc72a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,18 @@@
- apt (0.9.6) 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.1) unstable; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/contrib/fileutl.cc:

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