merged lp:~jackyf-devel/apt/debian-sid

diff --cc debian/changelog
index b2da4648b0c280994440baf6493fed49f1c28fc2,83aa70d4da467b09497f2ec659705e5f06427c32..5d6a6d6b11e14a72095715f809edb155629b142c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,22 +1,30 @@@
+ apt (0.7.20) unstable; urgency=low
+ 
+   [ Eugene V. Lyubimkin ]
+   * debian/changelog:
+     - Fixed place of 'merged install-recommends and install-task branches'
+       from 0.6.46.1 to 0.7.0. (Closes: #439866)
+   * 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)
+     - Applied patch from Daniel Burrows to document 'Debug' group of options.
+       (Closes: #457265)
+     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
+       (Closes: #438559)
+ 
+  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
+ 
 +apt (0.7.20~exp3) unstable; urgency=low
 +
 +  [ 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)
 +
+ apt (0.7.20~exp2) unstable; urgency=low
+ 
    [ Eugene V. Lyubimkin ]
    * doc/examples/sources.list:
      - Removed obsolete commented non-us deb-src entry, replaced it with