* merged from mainline

diff --combined debian/changelog
index 6d2a7173aed240fc336b95039b373dc6762373e7,0347020909baab50a12ff0f71613861d308c1716..c9f41078878cb64bd8ce895c175c639eb2007081
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,15 @@@
  apt (0.6.44) 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)
    * apt-pkg/deb/dpkgpm.cc: 
      - wording fixes (thanks to Matt Zimmerman)
 -    - fix error in dpkg interaction (closes: #364513, 
 -      thanks to Martin Dickopp)
 +    - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)
    * apt-pkg/tagfile.{cc,h}:
      - use MMap to read the entries (thanks to Zephaniah E. Hull for the
        patch) Closes: #350025
@@@ -18,8 -13,17 +18,17 @@@
    * doc/apt-ftparchive.1.xml:
      - fix documentation for "SrcPackages" -> "Sources" 
        (thanks to Bart Martens for the patch, closes: #307756)
- 
-  -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 16:41:54 +0200
+   * debian/libapt-pkg-doc.doc-base.cache:
+     - remove broken charackter from description (closes: #361129)
+   * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: 
+     - i18n fixes (closes: #349298)
+   * debian/postinst: dont fail on not available
+     /usr/share/doc/apt/examples/sources.list (closes: #361130)
+   * methods/ftp.cc:
+     - unlink empty file in partial if the download failed because
+       the file is missing on the server (closes: #316337)
+   
 - --
++ -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 18:41:04 +0200
  
  apt (0.6.43.3) unstable; urgency=low