* merged with mainline

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index ec802a8,a84146d..de9a43d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,14 @@@
  apt (0.6.45.1) unstable; urgency=low
  
    * debian/control:
-     - switched to libdb4.4 for building
+     - switched to libdb4.4 for building (closes: #381019)
+   * cmdline/apt-get.cc:
+     - show only the recommends/suggests for the candidate-version, not for all
+       versions of the package (closes: #257054)
+     - properly handle recommends/suggests or-groups when printing the list of
+       suggested/recommends packages (closes: #311619)
  
 - --
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  9 Aug 2006 14:27:54 +0200
  
  apt (0.6.45) unstable; urgency=low