merged from debian-sid

diff --cc debian/changelog
index 854bec8,1429623..671145f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -18,21 -21,11 +21,24 @@@ apt (0.7.10) UNRELEASED; urgency=lo
    [ Michael Vogt ]
    * debian/rules
      - fix https install location
+   * debian/apt.conf.daily:
+     - print warning if the cache can not be locked (closes: #454561),
+       thanks to Bastian Kleineidam
 +  * methods/gpgv.cc:
 +    - remove cruft code that caused timestamp/I-M-S issues
 +  * ftparchive/contents.cc:
 +    - fix error output
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - make the authentication download code more robust against
 +      servers/proxies with broken If-Range implementations
 +
 +  [ Chris Cheney ]
 +  * ftparchive/contents.cc:
 +    - support lzma data members
 +  * ftparchive/multicompress.cc:
 +    - support lzma output
  
-  -- Michael Vogt <mvo@debian.org>  Wed, 28 Nov 2007 17:10:49 +0100
+  -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 08 Dec 2007 12:13:58 -0200
  
  apt (0.7.9) unstable; urgency=low