merged from lp:~mvo/apt/mvo

diff --cc debian/changelog
index a290d038998b432009bdd585167e3f58280f8673,03936a31b57c43d516aaa7d015ff6f233f4e8730..803f0ab0d12488791e985ce393d9867fe69ea781
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,16 @@@
 -apt (0.7.25.1) UNRELEASED; urgency=low
 +apt (0.7.25ubuntu4) lucid; urgency=low
 +
 +  * cmdline/apt-cdrom.cc:
 +    - make Acquire::cdrom::AutoDetect default, this can be
 +      turned off with "--no-auto-detect"
++  * methods/http.cc:
++    - add cache-control headers even if no cache is given to allow
++      adding options for intercepting proxies
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
 +
 +apt (0.7.25ubuntu3) lucid; urgency=low
  
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
    * cmdline/apt-get.cc:
      - fix apt-get source pkg=version regression (closes: #561971)
    * apt-pkg/contrib/cdromutl.cc:

diff --cc methods/http.cc
Simple merge