Automated merge with file:/home/micah/devel/wget/eleven

diff --cc src/ChangeLog
index 322d5bdbf97e410b93eb39774dc20827864870f1,f3b0e539d18d3f889a9a22ac2ce6732b25944c00..000b68ab357c1bbb6e424dddc32d3ef1f0f17335
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,18 -1,25 +1,34 @@@
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +      * gettext.h: Imported from /usr/share/gettext, fuller handling
 +      of --disable-nls.
 +      * wget.h: Remove logic for handling lack of NLS (now in
 +      gettext.h).
 +
+ 2007-10-08  Micah Cowan  <micah@cowan.name>
+ 
+       * http.c (http_loop): Add send_head_first conditional back
+       around code that needs it, but not around the last-modified
+       header-parsing stuff this time. Removed no-longer-useful (was it
+       ever?) restart_loop boolean, continuing unconditionally at end
+       of send_head_first conditional block (if we haven't jumped out).
+ 
  2007-10-04  Micah Cowan  <micah@cowan.name>
  
        * http.c (http_loop): We've got_name if content_disposition
        support isn't on; make sure we continue properly in that case,
        even though we're not sending HEAD.
 +      * Makefile.in: Removed, replaced by Makefile.am.
 +      * Makefile.am: Converted from Makefile.in.
  
+ 2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
+       
+       * ftp.c: Use "_listing" for MSDOS (".listing" is illegal).
+ 
+       * url.c: Update comment for 'filechr_not_windows'.
+ 
+       * utils.c: Include <process.h> for 'getpid()' on Watcom.
+ 
  2007-10-02  Micah Cowan  <micah@cowan.name>
  
        * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main