merged lp:~donkult/apt/experimental

diff --cc apt-pkg/edsp.cc
index 44f7dbfd68bb9cb3f8ef53a7e7ae09407cfeb543,137398100673154eba3dd318f028c73a1a483ee8..791aac72f416364f149d133074e4fbf1747e93fb
--- 1/apt-pkg/edsp.cc
--- 2/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@@ -279,7 -286,7 +286,7 @@@ bool EDSP::ReadResponse(int const input
                        std::string msg = SubstVar(SubstVar(section.FindS("Message"), "\n .\n", "\n\n"), "\n ", "\n");
                        if (msg.empty() == true) {
                                msg = _("External solver failed without a proper error message");
--                              _error->Error(msg.c_str());
++                              _error->Error("%s", msg.c_str());
                        } else
                                _error->Error("External solver failed with: %s", msg.substr(0,msg.find('\n')).c_str());
                        if (Progress != NULL)

diff --cc debian/changelog
index a06abbbc08dfcb8864107da9584b8d562354b5b2,bda786e12a2d9a1df8325d1f495572378456a47f..27d1c7c07825e66664bfda7fe2049c573562030b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -13,12 -44,7 +44,7 @@@ apt (0.8.16~exp7) UNRELEASEDexperimenta
    * ftparchive/cachedb.cc:
      - fix buffersize in bytes2hex
  
-   [ David Kalnischkies ]  
-   * apt-pkg/deb/deblistparser.cc:
-     - fix crash when the dynamic mmap needs to be grown in
-       LoadReleaseInfo (LP: #854090)
- 
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Oct 2011 18:14:11 +0200
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Oct 2011 22:27:18 +0200
++ -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
  
  apt (0.8.16~exp6) experimental; urgency=low