Merging in the rest of Alex's bundle.

diff --cc src/ChangeLog
index d320f1502e421d4e945678dce970245105206923,7201511a9cc10d463a8f93cb19a2296b4624a03d..a2881858a155dea184a5b37794484047714eec2d
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +2008-04-11  Alexander Dergachev  <cy6erbr4in@gmail.com>
 +
 +      * utils.c (aprintf): Now we are setting limits (1 Mb) for text
 +      buffer when we use non-C99 vsnprintf.
 +      
+ 2008-04-11  Micah Cowan  <micah@cowan.name>
+ 
+       * ftp.c (getftp, ftp_loop_internal): Don't append to an existing
+       .listing when --continue is used.  Fixes bug #22825. Thanks to
+       Rabin Vincent <rabin@rab.in> for pointing the way with a
+       suggested fix!
+ 
  2008-04-10  Alexander Dergachev  <cy6erbr4in@gmail.com>
  
        * xmalloc.c, xmalloc.h (memfatal): Now exported; accepts an