Merge apt--mvo--0

Patches applied:

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-12
   * star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-13
   * commented the ftp no_proxy unseting in methods/ftp.cc

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-14
   * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-15
   * merged with matt's tree

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-16
   * added support for "Acquire::gpgv::options" in methods/gpgv.cc

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0
   tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1
   * slightly cosmetic change in methods/gpgv.cc

diff --cc debian/changelog
index 19d5bcd1f2d4e3ff5f57364dd51bf682b945e9a5,c384c399d2d8cb7536ccf8600370193fd61a8a77..3720861789e215ac65dd2fee159b05628d21329b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,10 @@@
-   * 
 +apt (0.6.32) hoary; urgency=low
 +
++  * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (patch-1)
++    - Implement Acquire::gpgv::options (Ubuntu bug#6283)
 +
 + -- Matt Zimmerman <mdz@ubuntu.com>  Tue,  8 Feb 2005 19:31:15 -0800
 +
  apt (0.6.31) hoary; urgency=low
  
    * Matt Zimmerman