* merged with main

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114
   * merged with mvo

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115
   * string fix

diff --cc apt-pkg/acquire-item.cc
index 11a449e,11a449e..86f61dd
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -642,7 -642,7 +642,7 @@@ bool pkgAcqMetaIndex::VerifyVendor(stri
     // check for missing sigs (that where not fatal because otherwise we had
     // bombed earlier)
     string missingkeys;
--   string msg = _("There was no public key available for the "
++   string msg = _("There are no public key available for the "
                  "following key IDs:\n");
     pos = Message.find("NO_PUBKEY ");
     if (pos != std::string::npos)

diff --cc debian/changelog
index 8bcb425,8bcb425..694d91b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -15,10 -15,10 +15,11 @@@ apt (0.6.43.1) unstable; urgency=lo
    * apt-get source won't download already downloaded files again
      (closes: #79277)
    * share/debian-archive.gpg: new 2006 ftp-archive signing key added
++    (#345891)
    * redownload the Release file if IMS-Hit and gpg failure
--  * deal with multiple signatures
++  * deal with multiple signatures on a Release file
  
-- -- Michael Vogt <mvo@debian.org>  Thu,  5 Jan 2006 23:47:40 +0100
++ -- Michael Vogt <mvo@debian.org>  Fri,  6 Jan 2006 01:17:08 +0100
  
  apt (0.6.43) unstable; urgency=medium