Merged from debian-sid branch.

diff --combined debian/changelog
index 285c11922f76873e602f4fdc0972c7a7faadc9b1,d0174400ce57d18c6de78d3f94aac39b69149932..0adbbac1b2a9914b94824e1f30a36f3104f5fadb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -7,18 -7,12 +7,18 @@@ apt (0.7.20) unstable; urgency=lo
    * buildlib/config.{sub,guess}:
      - Renewed. This fixes lintian errors.
    * doc/apt.conf.5.xml, debian/apt-transport-https:
 -    - Documented briefly 'APT::https' group of options. (Closes: #507398)
 +    - Documented briefly 'Acquire::https' group of options. (Closes: #507398)
      - Applied patch from Daniel Burrows to document 'Debug' group of options.
        (Closes: #457265)
      - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
        (Closes: #438559)
      - Mentioned '/* ... */' comments. (Closes: #507601)
 +  * methods/{http,https,ftp}, doc/apt.conf.5.xml:
 +    - Changed and unified the code that determines which proxy to use. Now
 +      'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
 +      and '{http,ftp}_proxy' environment variables are used only if options
 +      mentioned above are not specified.
 +      (Closes: #445985, #157759, #320184, #365880, #479617)
  
    [ Michael Vogt ]
    * add option to "apt-get build-dep" to mark the needed 
@@@ -26,12 -20,16 +26,16 @@@
      This is controlled via the value of
      APT::Get::Build-Dep-Automatic and is set "false" by default.  
      Thanks to Aaron Haviland, closes: #448743
+   * apt-inst/contrib/arfile.cc:
+     - support members ending with '/' as well (thanks to Michal Cihr,
+       closes: #500988)
  
    [ Christian Perrier ]
    * Translations:
      - Finnish updated. Closes: #508449 
+     - Galician updated. Closes: #509151
  
 - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
 + -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Mon, 15 Dec 2008 23:48:46 +0200
  
  apt (0.7.20~exp2) unstable; urgency=low