* merged from the apt--pdiff branch

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc debian/changelog
index 35bf91080d13cef6970ebf46301f8312c554ebc4,fc17d2f56b74e1cfa2bf3d8409d1e93488dd2d55..80c47bdeea6a03f5ac5e40dfe536bc1e11d6efcb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,3 +1,17 @@@
 +apt (0.7.0) experimental; urgency=low
 +
 +  * Branch that contains tall the new features
++  * Removed all #pragma interface/implementation
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 14 Dec 2006 11:31:41 +0100
 +
 +apt (0.6.46.5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/algorithm.cc:
 +    - use clog for all debugging
 +
 + -- Michael Vogt <mvo@debian.org>  Thu, 14 Dec 2006 11:31:41 +0100
 +
  apt (0.6.46.4) unstable; urgency=high
  
    * ack NMU (closes: #401017)