merged from david

diff --combined debian/changelog
index 9135d523b37d5f19c164e4759c4b16d27f92083a,f9638b78f656604b2f18e6018d41a89e4cd1825f..cfb7c814f47249a6bd69b6c8c1108f3bc17f58a5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--apt (0.7.26~exp6) UNRELEASED; urgency=low
++apt (0.7.26~exp6) experimental; urgency=low
  
    [ Michael Vogt ]
    * merge the remaining Ubuntu change:
@@@ -8,7 -8,7 +8,7 @@@
        that use round robin DNS)
      - support Original-Maintainer in RewritePackageOrder
      - enable cdrom autodetection via libudev by default
-     - show messsage about Vcs in use when apt-get source is run for
+     - show message about Vcs in use when apt-get source is run for
        packages maintained in a Vcs
      - better support transitional packages with mark auto-installed. 
        when the transitional package is in "oldlibs" the new package
@@@ -47,6 -47,7 +47,7 @@@
      - add a constant Exists check for MetaKeys
    * apt-pkg/acquire-item.cc:
      - do not try PDiff if it is not listed in the Meta file
+     - sent Last-Modified header also for Translation files
    * apt-pkg/cacheiterator.h:
      - let pkgCache::Iterator inherent std::iterator
    * ftparchive/writer.h:
@@@ -81,8 -82,13 +82,13 @@@
        looking code copycat from wget
    * ftparchive/writer.cc:
      - add ValidTime option to generate a Valid-Until header in Release file
+   * apt-pkg/policy.cc:
+     - get the candidate right for a not-installed pseudo package if
+       his non-pseudo friend is installed
+   * apt-pkg/indexcopy.cc:
+     - move the gpg codecopy to a new method and use it also in methods/gpgv.cc
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 09 Jun 2010 10:52:31 +0200
+  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 09 Jun 2010 21:15:46 +0200
  
  apt (0.7.26~exp5) experimental; urgency=low