merged from debian-sid

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

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

diff --cc debian/changelog
Simple merge

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

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