* merged apt--curl-https branch

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

diff --cc debian/changelog
index 52bdced8f0d3040e3379138d211d2dd40deae0f0,06cede5313f7793702e86b9f2de7b9be5bdc11f7..1ea2a294a4a79a95a1e1428d53fea753bda77cc2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,11 +1,28 @@@
- 
 +apt (0.7.0) experimental; urgency=low
 +
 +  * Branch that contains tall the new features
 +  * Removed all #pragma interface/implementation
 +  * Branch that contains tall the new features:
 +  * translated package descriptions
 +  * task install support
 +  * automatic dependency removal
 +  * Removed all #pragma interface/implementation
 +  * merged support for the new dpkg "Breaks" field 
 +    (thanks to Ian Jackson)
 +  * handle network failures more gracefully on "update"
 +  * support for unattended-upgrades (via unattended-upgrades
 +    package)
 +
 + -- 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
+     - only increase the score of installed applications if they 
+       are not obsolete 
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 19:39:05 +0100
 + -- Michael Vogt <mvo@debian.org>  Thu, 14 Dec 2006 11:31:41 +0100
  
  apt (0.6.46.4) unstable; urgency=high
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge

diff --cc doc/examples/configure-index
Simple merge

diff --cc methods/makefile
Simple merge