Automated merge.

diff --cc src/ChangeLog
index 9b42daca239e4600524bd8fc58fb0ef608d60c25,3bae231edd535e5982c64b5080ff77f5a8500781..9cd4d0034e356f57c3097424932ee6aff5fba84f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,13 +1,23 @@@
 +2007-10-14  Micah Cowan  <micah@cowan.name>
 +
 +      * recur.c (download_child_p): Print error if unlink of
 +      robots.txt fails.
 +
 +2007-10-14  Joshua David Williams  <yurimxpxman@gmail.com>
 +
 +      * recur.c (download_child_p): Remove robots.txt if
 +      --delete-after or --spider is on.
 +
+ 2007-10-14  Micah Cowan  <micah@cowan.name>
+ 
+       * cmpt.c, cookies.c, ftp-basic.c, ftp-ls.c, ftp.c, hash.c,
+       host.c, html-parse.c, html-url.c, http-ntlm.c, http.c, init.c,
+       log.c, main.c, netrc.c, openssl.c, res.c, url.c, utils.c,
+       wget.h: Replace uses of ISSPACE, etc with c_isspace, etc.
+       * gnu-md5.c, gnu-md5.h: Removed, in deference to gnulib.
+       * Makefile.am: Removed gnu-md5.h from wget_SOURCES.
+       * gen-md5.c: Changed #inclusion of gnu-md5.h to md5.h (gnulib's).
+ 
  2007-10-13  Micah Cowan  <micah@cowan.name>
  
        * Makefile.am: Make version.c depend on Wget dependencies (source