* merged with apt--mvo

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

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/tagfile.cc
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc debian/rules
Simple merge

diff --cc doc/examples/configure-index
index 5b3c1a55c1496be45ca55860067a91da0606f26d,73e20aa435c7be50c4871cd7b7bf154e05c9640b..55edd77e5ddc9cc25bb3e95e62edcbf4fe0467bf
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -259,8 -255,8 +263,8 @@@ Debu
    pkgDPkgPM "false";
    pkgDPkgProgressReporting "false";
    pkgOrderList "false";
- 
 +  pkgAutoRemove "false";   // show information about automatic removes
 -  
+   BuildDeps "false";
    pkgInitialize "false";   // This one will dump the configuration space
    NoLocking "false";
    Acquire::Ftp "false";    // Show ftp command traffic

diff --cc methods/http.cc
Simple merge