merge from the lp:~mvo/apt/mvo branch

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc debian/changelog
index 8eca51cc4d729a571efd7208d85453acddd21b1b,fa4cdc2518b94ee669009275f04e587e779c4b34..f401f312c9d0f39cc450a4c009bf0a0a62bbeeac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,13 +1,46 @@@
 -apt (0.8.16~exp15) unstable; urgency=low
++apt (0.9.2) UNRELEASED; urgency=low
+ 
++  [ Michael Vogt ]
+   * apt-inst/contrib/extracttar.cc:
+     - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
+       that the pipe is closed when InFd is closed. This fixes a Fd leak
+       (LP: #985452)
+ 
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Apr 2012 10:53:30 +0200
++  [ Adam Conrad ]
++  * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
++
++  [ Thorsten Spindler ]
++  * apt-pkg/deb/dpkgpm.cc:
++    - do not crash if (*I).Pkg is NULL (LP: #939867)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 20 Apr 2012 09:13:19 +0200
++
 +apt (0.9.1) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * cmdline/apt-get.cc:
 +    - if pkgCacheFile::Generate is disabled in 'update' don't
 +      remove the caches (and don't try to open them)
 +  * apt-pkg/packagemanager.cc:
 +    - init counter in SmartConfigure so that the loop-breaker isn't
 +      triggered at random… (Closes: #669060)
 +
 +  [ Christian Perrier ]
 +  * Fix typo in apt-get(8). Closes: #664833
 +  * Replace "argument" by "paramètre" in French translation.
 +    Merci, les Titeps!
 +  * Drop hardcoded "en.html" suffix in apt-secure manpage.
 +    Thanks to David Prevot.
 +  
 + -- Michael Vogt <mvo@debian.org>  Tue, 17 Apr 2012 09:49:31 +0200
 +
 +apt (0.9.0) unstable; urgency=low
 +
 +  * upload to debian/unstable
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 15:53:17 +0200
  
 -apt (0.8.16~exp14) UNRELEASED; urgency=low
 +apt (0.9.0~exp1) experimental; urgency=low
  
    [ Michael Vogt ]
    * apt-pkg/packagemanager.cc: