* merged from apt--mvo

diff --cc debian/changelog
index 0f9b0197377059f38920d68b147b2d7b8d825ad0,887d2f2545f623629a2a759ea212b1ea2e152f91..066baa8bf9c9e9b0870684bdf32079beae275923
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,10 +1,27 @@@
  apt (0.6.46.3) unstable; urgency=low
  
 - --
+   * apt-pkg/deb/dpkgpm.cc:
+     - make progress reporting robust against multiline error
+       messages 
+ 
 +  * Merged from Christian Perrier bzr branch:
 +    - ca.po: Updated to 514t
 +    - be.po: Updated to 514t
 +    - it.po: Updated to 514t
 +    - hu.po: Updated to 514t
 +    - zh_TW.po: Updated to 514t
 +    - ar.po: Updated to 293t221u.
 +    - ru.po: Updated to 514t. Closes: #392466
 +    - nb.po: Updated to 514t. Closes: #392466
 +    - pt.po: Updated to 514t. Closes: #393199
 +    - fr.po: One spelling error corrected: s/accèder/accéder
 +    - km.po: Updated to 514t.
 +    - ko.po: Updated to 514t.
 +    - bg.po: Updated to 514t.
 +    - de.po: Updated to 514t.
 +    - en_GB.po: Updated to 514t.
 +
 + -- Michael Vogt <mvo@debian.org>  Mon, 30 Oct 2006 08:51:14 +0100
  
  apt (0.6.46.2) unstable; urgency=low