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

diff --cc doc/ChangeLog
index 0989f76e815feb67023ba02bb948b90f17ed1159,b2f017c25bdff8128f713e9958cdc9effb1f75ae..42ae9897388ca1a7578dffc7d52c6c6f17981def
--- 1/doc/ChangeLog
--- 2/doc/ChangeLog
+++ b/doc/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2007-10-10  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi <Wgetrc Commands>: Fixed "doewnloads" typo.
+ 
 +2007-10-08  Micah Cowan  <micah@cowan.name>
 +
 +      * wget.texi: Credit to Ralf Wildenhues for automakifying patches.
 +
 +2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      * Makefile.in: Removed, replaced by Makefile.am.
 +      * Makefile.am: Converted from Makefile.in.
 +
  2007-10-03  Micah Cowan  <micah@cowan.name>
  
        * wget.texi <Wgetrc Commands>: Cleaned up alphabetization,

diff --cc doc/wget.texi
Simple merge

diff --cc src/ChangeLog
Simple merge