Sync with apt--main--0--patch-78

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-77
   Merge apt--mvo--0

 * apt@packages.debian.org/apt--main--0--patch-78
   Update changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14
   * changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
   * merged with matts tree

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
   * whitespace change to add incomplete log for last patch

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
   * honor "Acquire::gpgv::Options" in apt-cdrom too

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
   * corrected a incorrect use of string().c_str() (thanks to mdz!)

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc debian/changelog
index 100125392d0f5a01f9f2456c72fb7fafe817ad97,a6886490cd7d1ef6c1c1c51799488d03d13a99e1..4cdeee956255dcc96354de7a3d37a87e198f586d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,23 @@@
- apt (0.6.35os1) unstable; urgency=low
++apt (0.6.36os1) unstable; urgency=low
 +
 +   * Resync with apt--main--0--patch-71.
 +     [ This include the DDTP support for testing propose, report bugs
 +     directly to me ]
 +
-  -- Otavio Salvador <otavio@debian.org>  Wed, 23 Mar 2005 17:19:28 -0300
++ -- Otavio Salvador <otavio@debian.org>  Thu,  7 Apr 2005 21:16:46 -0300
++
+ apt (0.6.36) unstable; urgency=low
+ 
+   * Merge apt--mvo--0:
+     - apt-pkg/acquire-item.cc:
+       added "Acquire::BrokenProxy" that will force apt to always 
+       re-get the Release.gpg file (for broken proxies)
+     - debian/apt.cron.daily:
+       MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+     - apt-pkg/cdrom.cc:
+       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
+  
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 31 Mar 2005 20:37:11 +0200
  
  apt (0.6.35) hoary; urgency=low