merge with debian-experimental-ma to get the public policy back

diff --cc apt-pkg/cachefile.h
Simple merge

diff --cc debian/changelog
index edea3400a0fef368a5203291848376c08ffc8e34,d29705d24d3a2c8bb63adfba0450d5298a052e3f..9367c174342728db6a356d57a01b82709aa97071
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,24 @@@
- apt (0.7.26~exp7) UNRELEASED; urgency=low
++apt (0.7.26~exp8) UNRELEASED; urgency=low
 +
 +  * apt-pkg/cacheset.cc:
 +    - get the candidate either from an already built depcache
 +      or use the policy which is a bit faster than depcache generation
 +  * apt-pkg/orderlist.cc:
 +    - untouched packages are never missing
 +  * apt-pkg/packagemanager.cc:
 +    - packages that are not touched doesn't need to be unpacked
 +
-  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 13:04:47 +0200
++ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 16:36:58 +0200
 +
- apt (0.7.26~exp6) UNRELEASED; urgency=low
+ apt (0.7.26~exp7) experimental; urgency=low
+ 
+   * apt-pkg/cachefile.h:
+     - make pkgPolicy public again, libapt-pkg-perl (and probably
+       others) get unhappy without that
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 10 Jun 2010 15:33:24 +0200
+ 
+ apt (0.7.26~exp6) experimental; urgency=low
  
    [ Michael Vogt ]
    * merge the remaining Ubuntu change: