Merged with eleven for Gisle's mswindows.c patch.

diff --cc src/ChangeLog
index 6d1733fde990f38115ac0121248365acea796c4a,ee370c365230d3ea97f679175ab4627b269c870e..765585344f105bf72df6feb2bacc8cd392347c5e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,14 +1,19 @@@
 +2007-10-09  Gisle Vanem  <gvanem@broadpark.no>
 +
 +      * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer
 +      needed.  Hence simply the prototype. Free 'exec_name' at exit.
 +
+ 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).
+       * main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS.
+       * Makefile.am: added @LIBINTL@ to LIBS (though it probably
+       belongs in LDADD, along with everything else currently assigned
+       to LIBS).
+ 
  2007-10-08  Micah Cowan  <micah@cowan.name>
  
        * http.c (http_loop): Add send_head_first conditional back

diff --cc src/main.c
Simple merge