Merged with debian-sid branch.

diff --cc debian/changelog
index 304e0fb2ad41353389b7b6cb767dfcf5b3d43835,35a8fb2b4f68e9236546d0c5d6425770aa2fba82..5b57c96a326b86569cf0be3d4847a02eba999509
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -13,18 -13,13 +13,19 @@@ apt (0.7.20) unstable; urgency=lo
      - 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 ]
-   * make "apt-get build-dep" installed packages marked automatic
-     by default. This can be changed by setting the value of
-     APT::Get::Build-Dep-Automatic to false (thanks to Aaron 
-     Haviland, closes: #44874, LP: #248268)
+   * add option to "apt-get build-dep" to mark the needed 
+     build-dep packages as automatic installed. 
+     This is controlled via the value of
+     APT::Get::Build-Dep-Automatic and is set "false" by default.  
+     Thanks to Aaron Haviland, closes: #448743
  
    [ Christian Perrier ]
    * Translations: