merged from the mvo branch

diff --cc debian/apt.cron.daily
Simple merge

diff --cc debian/changelog
index 970c7029fc4d279e1609df133a938877f395c178,668cf5596b18e4434fc2f37e80a1dc5b3465462d..b379313e44095f46c03b05479ab53b7d39965afc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -68,6 -25,14 +68,8 @@@ apt (0.7.22) UNRELEASED; urgency=lo
    * methods/http.cc:
      - ignore SIGPIPE, we deal with EPIPE from write in 
        HttpMethod::ServerDie() (LP: #385144)
 -  * apt-pkg/deb/dpkgpm.cc:
 -    - provide DPkg::Chroot-Directory config option (useful for testing)
+   * Only run Download-Upgradable and Unattended-Upgrades if the initial
+     update was successful Closes: #341970
 -  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 May 2009 17:51:42 +0200
 -
 -  [ Michael Vogt ]
    * apt-pkg/indexcopy.cc:
      - support having CDs with no Packages file (just a Packages.gz)
        by not forcing a verification on non-existing files
@@@ -89,29 -77,6 +91,27 @@@
    * build fixes for g++-4.4
    * cmdline/apt-mark:
      - add "showauto" option to show automatically installed packages
-   * Refactored condition structure to make download and upgrade performed 
-     if only previous steps succeeded. Closes: #341970
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
 +  [ Julian Andres Klode ]
 +  * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
 +    ReadConfigFile.
 +  * Introduce support for the Enhances field. (Closes: #137583) 
 +  * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512)
 +  * configure-index: document Dir::Etc::SourceParts and some other options
 +    (Closes: #459605)
 +  * Remove Eugene V. Lyubimkin from uploaders as requested.
 +  * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc:
 +    - Support reading until EOF if Size=0 to match behaviour of
 +      SHA1Summation and SHA256Summation
 +
 +  [ Osamu Aoki ]
 +  * Updated cron script to support backups by hardlinks and 
 +    verbose levels.  All features turned off by default. 
 +  * Added more error handlings.  Closes: #438803, #462734, #454989, 
 +  * Documented all cron script related configuration items in 
 +    configure-index.
  
    [ Dereck Wonnacott ]
    * apt-ftparchive might write corrupt Release files (LP: #46439)