* 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

apt-pkg/deb/debmetaindex.cc

@@ -173,7 +173,7 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
-   if(_config->FindB("APT::Authentication::Trust-CDROM", false))
+   if(_config->FindB("APT::Authentication::TrustCDROM", false))
       if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
 	 return true;
    

debian/changelog

@@ -2,6 +2,7 @@ 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)
 
@@ -26,7 +27,7 @@ apt (0.6.42) unstable; urgency=low
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
   * support for apt-get [build-dep|source] -t (closes: #152129)
-  * added "APT::Authentication::Trust-CDROM" option to make the life
+  * added "APT::Authentication::TrustCDROM" option to make the life
     for the installer people easier (closes: #334656)
   * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
     (closes: #334671)

doc/examples/configure-index

@@ -74,7 +74,7 @@ APT
 
   Authentication
   {
-     Trust-CDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CDROM always trusted
   };
 
   GPGV