Sync with apt@packages.debian.org/apt--main--0--patch-74

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-72
   Open 0.6.36

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

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-9
   * be more carefull when building the archive path (thanks to matt!)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-10
   * ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-11
   * run check_size_constraints independent of AUTOCLEAN (thanks Matt)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-12
   * check cache size after AUTOCLEAN was run (but independent)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-13
   * MinAge implemented, cron script variables documented, bugfix in check_stamp() function

diff --cc debian/changelog
index 3059f24,f20dcc3..974ba5e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,26 @@@
 +apt (0.6.35os1) 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
 +
++apt (0.6.36) hoary; urgency=low
++
++  * 
++
++ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Mar 2005 08:27:23 -0800
++
  apt (0.6.35) hoary; urgency=low
  
-   * Merge apt--mvo--0:
+   * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
      - 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
  
   -- Matt Zimmerman <mdz@ubuntu.com>  Mon,  7 Mar 2005 20:08:33 -0800