Sync with Michael branch

diff --combined debian/changelog
index c81d487ab8e6ddfdc8ace91a833820280c73da28,d18c19d0c81c6e5afa648b55b7720ece2342a6f4..6e74f42656dd93010631263aa39cf144872bf5cd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,10 +1,10 @@@
  apt (0.7.4) UNRELEASED; urgency=low
  
+   [Michael Vogt]
+   * cmdline/apt-get.cc:
+     - fix in the task-install code regexp (thanks to Adam Conrad and
+       Colin Watson)
+   [Otavio Salvador]
    * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
    * Fix compilation warnings:
      - apt-pkg/contrib/configuration.cc: wrong argument type;
@@@ -9,10 -14,8 +14,10 @@@
        - type conversion;
        - unused variable;
        - changed SetupProxy() method to void;
 +  * Simplified HttpMethod::Fetch on http.cc removing Tail variable;
 +  * Fix pipeline handling on http.cc (closes: #413324)
  
-  -- Otavio Salvador <otavio@ossystems.com.br>  Mon, 02 Jul 2007 13:27:54 -0300
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Jul 2007 23:20:15 +0100
  
  apt (0.7.3) unstable; urgency=low