* merged with apt--mvo--0 and apt--ddtp--0

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--ddtp--0--patch-19
   * ABI/API change: add "VerIterator::TranslatedDescription()" method to make the life of the api user easier

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78
   * fix a incorrect example

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79
   * revert patch from patch-59, causes all sorts of trouble

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80
   * fix changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81
   * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL

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

diff --cc apt-pkg/pkgrecords.h
Simple merge

diff --cc debian/changelog
index 2b100e0403b10992c621e1bbfcd755911aeadef8,0e85b511793c5e3815388673fe1440ad71606052,9716c3836d31aa4c70bbb42be2240d15f10d908b..b854d174198dd8e0846069c9c72cc5d6f081fa7f
--- 1/debian/changelog
--- 2/debian/changelog
--- 3/debian/changelog
+++ b/debian/changelog
@@@@ -1,13 -1,3 -1,15 +1,25 @@@@
-  apt (0.6.42.0exp1) experimental; urgency=low
+++apt (0.6.42.1exp1) experimental; urgency=low
 ++
 ++  * added support for package index diffs 
 ++  * added support for i18n of the package descriptions
 ++  * synced with the apt--debian-sid--0 branch
 ++  * build from mvo@debian.org--2005/apt--debian-experimental--0
 ++    (from http://people.debian.org/~mvo/arch)
 ++
 ++ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
 ++
++ apt (0.6.42.1) unstable; urgency=low
++ 
++   * fix a incorrect example in the apt_prefrences man page
++     (thanks to Filipus Klutiero, closes: #282918)
++   * apt-pkg/pkgrecords.cc:
++     - revert patch from last version, it causes trouble on alpha 
++       and ia64 (closes: #335102, #335103)
++   * cmdline/apt-get.cc:
++     - be extra carefull in FindSrc (closes: #335213)
++ 
++  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
++ 
   apt (0.6.42) unstable; urgency=low
   
     * apt-pkg/cdrom.cc: