* merged the apt--sane-handle-timeout--0 branch

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-87

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1
   * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2
   * merged with the fixes branch to make it build again

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
   * merged with main

diff --cc debian/changelog
index 614041acf70d7b0dd6bf214e8453a68b906741ca,a01e1491be4102b81df01739073e947d1aeddd0b..2b4e81595d387b446a6e24b9acfbc180640bf732
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,3 +1,23 @@@
 +apt (0.6.40.2) unstable; urgency=low
 +
 +  * improved the support for "error" and "conffile" reporting from
 +    dpkg, added the format to README.progress-reporting
 +  * added README.progress-reporting to the apt-doc package
++  * improved the network timeout handling, if a index file from a 
++    sources.list times out, don't try to get the other files from
++    that entry
 +
 + --
 +
 +apt (0.6.40.1) unstable; urgency=low
 +
 +  * bugfix in the parsing code for the apt<->dpkg communication. apt 
 +    crashed when dpkg sends the same state more than once under certain
 +    conditions
 +  * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/
 +
 + -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 13:24:58 +0200
 +
  apt (0.6.40) unstable; urgency=low
  
    * Patch from Jordi Mallach to mark some additional strings for translation