Merge branch 'maint'

diff --cc ChangeLog
index 0f17130e3eb225728b74293fac7f7ea58d9023e1,6d40c54a299c146370da17cabcc2165f817b8446..f8c2dc31ccb68f79d30c36fd3f3311fcae3df56d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,33 +1,41 @@@
+ 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Extend test on `nostdinc' automake option.
+       * tests/nostdinc.test: Enable `errexit' shell flag.  Related and
+       unrelated minor changes.  Make the grepping of the generated
+       Makefile.in slighty stricter.  Generate and run configure, so that
+       the generated Makefile can be grepped too.
+ 
+ 2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Make gnupload portable to EBCDIC hosts.
+       * lib/gnupload: Use literal newline as argument for 'tr' rather
+       than \015, for EBCDIC hosts.  Also, avoid unportable nested
+       double-quotes and backquotes.
+       * THANKS: Update.
+       Report from Eric Blake and Steve Goetze via gnulib.
+ 
+ 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix Autoconf version required by Automake's configure.
+       Automake configure script used to tell that automake required
+       autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
+       and if that was not found, it gave an error saying that Automake
+       required configure 2.61a-341 or later.  This change should
+       eliminate such inconsistencies.
+       * configure.ac ($required_autoconf_version): New variable.
+       Use it throughout.
+ 
  2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +      Fix truncated comment in Makefile.am.
 +      * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished
 +      sentence in comment.
 +      Report by Stefano Lattarini.
 +
 +      Relax silent8.test for NetBSD make.
 +      * tests/silent8.test: Accept ./foo.info in output as well.
 +
        Fix unportable sed script in maintainer-check test.
        * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
        not contain semicolon after 'b' or brace commands, for NetBSD.

diff --cc THANKS
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/gnupload
Simple merge