Merge branch 'maint'

diff --cc ChangeLog
index 825589d,01ee527..f38f8b6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,29 +1,48 @@@
+ 2010-09-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       parallel-tests: avoid command-line length limit issue.
+       * automake.in (handle_tests): New argument $makefile, new
+       substitution %MAKEFILE%.
+       (generate_makefile): Adjust.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
+       sanitized TEST_LOGS value as makefile snippet on standard
+       input to $(MAKE), to avoid exceeding the command line limit on
+       w32 (MSYS).
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+ 
+       Posix 2008 requires make to set errexit.
+       * lib/am/check.am: Update comment.
+ 
+ 2010-08-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix bug in test missing6.test.
+       * tests/missing6.test: Fix the hack used to edit `configure.in',
+       to avoid producing a configure script that breaks with shells
+       that do not support $LINENO.  Also throw in a couple of cosmetic
+       changes.
+ 
 +2010-09-02  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Make ar-lib support backslashed files in archives.
 +      * lib/ar-lib: If an archive member contains a backslash, make sure
 +      it is escaped when the archive member is extracted.
 +      * tests/ar-lib.test: Test the above.
 +
 +2010-08-31  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Do file name conversion for object files in the compile wrapper.
 +      * lib/compile (func_cl_wrapper): Do file name conversion for object
 +      files (i.e. extensions .obj, .OBJ, .o and .O) if needed.
 +      * tests/compile4.test: Test the above.
 +
  2010-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +      Speed up removal of auxiliary linker output files for ltlibraries.
 +      * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Rewrite using just
 +      one `rm' invocation.
 +      Report by Bob Friesenhahn.
 +
        Improve robustness of mdate-sh script.
        * lib/mdate-sh: Sanitize zsh behavior on startup, to ensure
        $ls_command is word-split properly upon invocation.

diff --cc NEWS
Simple merge

diff --cc automake.in
index c0c5289,fa098bb..7798bb0
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge