* merged from apt--mvo

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

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

diff --cc debian/changelog
index 9f8326739ee7529eac139bcc5b702732d55087a5,7893f2599e97ac581bf36c8aa4336bf2c58605a3..c40804746674b357c0b52699c7784d59abee0c6c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -22,8 -4,14 +22,14 @@@ apt (0.6.46.5) UNRELEASED; urgency=lo
      - use clog for all debugging
      - only increase the score of installed applications if they 
        are not obsolete 
+     - fix resolver bug on removal triggered by weak-dependencies 
+       with or-groups
+   * methods/http.cc:
+     - send apt version in User-Agent
+   * apt-pkg/deb/debrecords.cc:
+     - fix SHA1Hash() return value
  
 - -- 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 methods/http.cc
Simple merge