* merged with mainline

diff --cc debian/changelog
index dccf4a99f0cb7909bd195ee58bea436a92650f5a,fd391c972f5e9fc92339f7bee9b2dbfd9fdb5e5d..9a7ee7213a8462eee244d7628dce6351dfc6ede5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,7 +1,12 @@@
  apt (0.6.43.4) unstable; urgency=low
  
    * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
 +  * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
 +    (thanks to Anthony Towns)
 +  * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
 +    (thanks to Anthony Towns)
 +  * apt pdiff support from experimental merged
+   * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
    * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
        * bg.po: Added, complete to 512t. Closes: #360262