* merged with main

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
   * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu

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

diff --cc debian/changelog
index ff400a6aba5454c759922e1017668f2229c57b19,6b858cdcde162ae4e96696bf3053965eb3e213f1..2b100e0403b10992c621e1bbfcd755911aeadef8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,13 @@@
 +apt (0.6.42.0exp1) 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) unstable; urgency=low
  
    * apt-pkg/cdrom.cc: