* merged from Christian Perrier (http://www.perrier.eu.org/debian/packages

/d-i/level4/apt-main)

diff --cc debian/changelog
index 92c12b5a99dcf163ce5503ab3ea769ac2bc0f1da,385c8ca23b7048ff06d04ca1b53192e3a5f98941..db84bc65a87abed9a6c93c58789c2d95564588ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,3 +1,21 @@@
 +apt (0.6.46.1) unstable; urgency=low
 +
 +  * methods/gzip.cc:
 +    - deal with empty files 
 +  * Applied patch from Daniel Schepler to make apt bin-NMU able.  
 +    (closes: bug#359634)
 +  * rebuild against current g++ because of:
 +    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
 +    (closes: #390189)
 +  * fix broken i18n in the dpkg progress reporting, thanks to 
 +    Frans Pop and Steinar Gunderson. (closes: #389261)
++  * Merged from Christian Perrier bzr branch:
++    * fi.po: Updated to 514t. Closes: #390149
++    * eu.po: Updated to 514t. Closes: #389725
++    * vi.po: Updated to 514t. Closes: #388555
 +  
 + --
 +
  apt (0.6.46) unstable; urgency=low
  
    * debian/control: