merge with lp:~mvo/apt/sid to get the finale 0.7.25 state

diff --cc debian/changelog
index cb46394b5a5d51b1af2eaa11b8c3ee0c4a9fccd7,53dfcce12e4f012a8e02ee688cfb6c156df8f921..9a17b25c4db05de3d93df1a31f841176aab42090
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,4 +1,27 @@@
-   * doc/apt.conf.5.xml:
-     - briefly document the behaviour of the new https options
-   * methods/connect.cc:
-     - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
-       in response to Bernhard R. Link, thanks! (Closes: #505020)
-   * methods/rred.cc:
-     - rewrite to be able to handle even big patch files
-     - adopt optional mmap+iovec patch from Morten Hustveit
-       (Closes: #463354) which should speed up a bit. Thanks!
 +apt (0.7.26) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * [BREAK] add possibility to download and use multiply
 +    Translation files, configurable with Acquire::Translation
 +    (Closes: #444222, #448216, #550564)
 +  * Ignore :qualifiers after package name in build dependencies
 +    for now as long we don't understand them (Closes: #558103)
-   * methods/http{,s}.cc
-     - add config setting for User-Agent to the Acquire group,
-       thanks Timothy J. Miller! (Closes: #355782)
-     - add https options which default to http ones (Closes: #557085)
 +  * apt-pkg/contrib/mmap.{cc,h}:
 +    - extend it to have a growable flag - unused now but maybe...
 +  * apt-pkg/pkgcache.h:
 +    - use long instead of short for {Ver,Desc}File size,
 +      patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
 +  * apt-pkg/acquire-item.cc:
 +    - allow also to skip the last patch if target is reached,
 +      thanks Bernhard R. Link! (Closes: #545699)
-   * ftparchive/*:
-     - fix a few typos in strings, comments and manpage,
-       thanks Karl Goetz! (Closes: #558757)
-   * debian/apt.cron.daily:
-     - check cache size even if we do nothing else otherwise, thanks
-       Francesco Poli for patch(s) and patience! (Closes: #459344)
 +  * ftparchive/writer.{cc,h}:
 +    - add APT::FTPArchive::AlwaysStat to disable the too aggressive
 +      caching if versions are build multiply times (not recommend)
 +      Patch by Christoph Goehre, thanks! (Closes: #463260)
- apt (0.7.25) UNRELEASED; urgency=low
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 +
+ apt (0.7.25) unstable; urgency=low
  
    [ Christian Perrier ]
    * Fix apt-ftparchive(1) wrt description of the "-o" option.

diff --cc doc/apt-ftparchive.1.xml
Simple merge