Automated merge.

diff --cc src/ChangeLog
index 697919d3c93adbc00a3cad0b1bf312b2c715cceb,37d39d80fd54b5960c74a94c1ea442ef72895a3a..28cb6640acbffd0a9c364a4a4707392338a592fa
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
 +2009-04-20  Micah Cowan  <micah@cowan.name>
 +
 +      * Makefile.am (version.c): Fix unportable use of "echo -n".
 +
+ 2009-04-13  Steven Schubiger  <stsc@member.fsf.org>
+ 
+       * ftp.c (ftp_retrieve_list): Move the duplicated code that
+       determines the local file to a function.
+       
+       * http.c (http_loop): Likewise.
+ 
+       * retr.c (set_local_file): New function.
+ 
  2009-04-11  Steven Schubiger  <stsc@member.fsf.org>
  
        * init.c (initialize): Run a custom SYSTEM_WGETRC when