Automated merge.

diff --cc doc/ChangeLog
Simple merge

diff --cc doc/sample.wgetrc
Simple merge

diff --cc doc/wget.texi
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/http.c
Simple merge

diff --cc src/init.c
index 06a4d3c8d08658fd2e2b7205ef1bd34a7b3f40f1,991f570fda727480284e09319aeb1a1651d02f17..5ab0862cbcf527c729fbff534382608c817f4450
--- 1/src/init.c
--- 2/src/init.c
+++ b/src/init.c
@@@ -332,7 -335,13 +335,15 @@@ defaults (void
  
    opt.max_redirect = 20;
  
 +  opt.waitretry = 10;
++
+ #ifdef ENABLE_IRI
+   opt.enable_iri = true;
+ #else
+   opt.enable_iri = false;
+ #endif
+   opt.locale = NULL;
+   opt.encoding_remote = NULL;
  }
  \f
  /* Return the user's home directory (strdup-ed), or NULL if none is

diff --cc src/main.c
Simple merge

diff --cc src/options.h
Simple merge

diff --cc tests/ChangeLog
index c3155848d2280baf8d8d0f61ae59ed2301e4d448,ffe5fdddbdc1b8e09820a721a2da03015cdfbde8..16e7bd3b778c920bd03e274cd713fa6c1d4bc71c
--- 1/tests/ChangeLog
--- 2/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,13 -1,11 +1,21 @@@
+ 2008-11-26  Micah Cowan  <micah@cowan.name>  (not copyrightable)
+ 
+       * Test-ftp-iri-disabled.px, Test-ftp-iri-fallback.px,
+       Test-ftp-iri.px, Test-idn-cmd.px, Test-idn-headers.px,
+       Test-idn-meta.px, Test-iri-disabled.px,
+       Test-iri-forced-remote.px, Test-iri-list.px, Test-iri.px: More
+       module-scope warnings.
+ 
 +2008-11-25  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * WgetTest.pm.in: Remove the magic interpreter line;
 +      replace -w with lexical warnings.
 +
 +2008-11-13  Steven Schubiger  <stsc@members.fsf.org>
 +
 +      * FTPServer.pm, FTPTest.pm, HTTPServer.pm, HTTPTest.pm,
 +      WgetTest.pm.in: Clean up leftover whitespace.
 +
  2008-11-12  Steven Schubiger  <stsc@members.fsf.org>
  
        * Test-auth-basic.px, Test-auth-no-challenge.px,

diff --cc tests/HTTPServer.pm
Simple merge