* merged with mainline

diff --cc debian/changelog
index 89322ae313ccd5a4ce30258d6a049ebbad24ada8,8e8fda71c320672b9cf8de949e32ab4a052b9ce5..dccf4a99f0cb7909bd195ee58bea436a92650f5a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,15 @@@
  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
+   * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+       * bg.po: Added, complete to 512t. Closes: #360262
  
-  -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 13:05:24 +0200
 -
 - --
++ -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 16:41:54 +0200
  
  apt (0.6.43.3) unstable; urgency=low