* merged from apt--mvo

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

diff --cc debian/changelog
index 2b37e51aea2824259d24641bfca5cfa29964df1d,127c5fd83e48519d01fa6dffa7b294f83f7e05ac..f39b0a07327022c3633844d57be81fca1544ebe2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,10 +1,24 @@@
+ apt (0.6.46.5) unstable; urgency=low
+ 
+   * apt-pkg/algorithm.cc:
+     - use clog for all debugging
+ 
+  --
+ 
 +apt (0.6.46.4ubuntu2) feisty; urgency=low
 +
 +  * apt-pkg/algorithms.cc: add missing call to MarkKeep
 +    so that dist-upgrade isn't broken by unsatisfiable Breaks.
 +    (thanks to Ian Jackson)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 23:07:24 +0100
 +
 +apt (0.6.46.4ubuntu1) feisty; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Dec 2006 12:13:14 +0100
 +
  apt (0.6.46.4) unstable; urgency=high
  
    * ack NMU (closes: #401017)