merged frm donkult

diff --cc debian/changelog
index 9ea25ef8101277bc9af760461bd99d0d089b1d67,ba6e4f49a5f4ed291277daf52bb6de1ad797a3fb..98ae49f74751b26895349b3e37c3839f35ade372
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,8 -3,13 +3,14 @@@ apt (0.9.7.7) UNRELEASED; urgency=lo
    [ Program translation updates ]
    * Catalan (Jordi Mallach)
    * Drop a confusing non-breaking space. Closes: #691024
 +  * Thai (Theppitak Karoonboonyanan). Closes: #691613
  
+   [ David Kalnischkies ]
+   * apt-pkg/packagemanager.cc:
+     - do not do lock-step configuration for a M-A:same package if it isn't
+       unpacked yet in SmartConfigure and do not unpack a M-A:same package
+       again in SmartUnPack if we have already configured it (LP: #1062503)
+ 
   -- Jordi Mallach <jordi@debian.org>  Thu, 18 Oct 2012 23:30:46 +0200
  
  apt (0.9.7.6) unstable; urgency=low