Merge with Matt

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 debian/apt.cron.daily
Simple merge

diff --cc debian/changelog
index 2b093b0,a688649..1071d0b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,29 +1,21 @@@
+ 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
  
 -  * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
 +  * Merge apt--mvo--0:
      - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
        from growing too large (Ubuntu #6761)
 -    - some comments about the pkgAcqMetaSig::Custom600Headers() added
 -    - use gpg --with-colons
 -    - commented the ftp no_proxy unseting in methods/ftp.cc
 -    - added support for "Acquire::gpgv::options" in methods/gpgv.cc
 -  * Merge bubulle@debian.org--2005/apt--main--0
 -    - Make capitalization more consistent
 -    - Un-fuzzy translations resulting from capitalization changes
 -    - Italian translation update
  
   -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800
  

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