Merge branch 'maint'

diff --cc ChangeLog
index 409ab8a,7883d5e..49af987
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,38 +1,50 @@@
+ 2010-10-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Add support for newer python versions.
+       * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
+       _AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
+       line and fix indentation.
+       * THANKS: Updated.
+       From a report by Thomas Klausner.
+ 
+       Add test for `AM_WITH_DMALLOC' macro.
+       * tests/dmalloc.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+ 
+       Fix nits and bugs in tests `help*.test'.
+       * tests/help4.test: Fix broken sed commands used to strip `-W...'
+       flags away from "$AUTOMAKE" and "$ACLOCAL".
+       * tests/help3.test: Likewise, and fix a botched comment.
+       * tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
+       instead of "$AUTOMAKE ... && Exit 1", for consistency and to
+       please maintainet-check.
+       * tests/help2.test: Likewise.
+ 
+ 2010-10-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Improve tests `help*.test' (also fixes maintcheck failures).
+       * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
+       flags stripped away rather than hard-coded `automake-$APIVERSION',
+       to better honour user-overrides.  Similarly for aclocal.
+       * tests/help2.test: Likewise.
+       * tests/help3.test: Likewise.
+       * tests/help4.test: Likewise.
+ 
  2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +      tests: fix ar-lib.test for echo that interprets backslashes.
 +      * tests/ar-lib.test: Use printf instead of echo.  Avoid test -a.
 +      More robust quoting.
 +
 +2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      maintainer-check coverage for variables before rules.
 +      * Makefile.am (sc_ensure_testsuite_has_run): Suggest keeping
 +      around the test directories.
 +      (sc_tests_makefile_variable_order): New rule with a heuristic to
 +      catch ordering violations.
 +
        Document and fix expansion of variables before rules.
        * doc/automake.texi (General Operation): Document that variables
        are expanded before rules.

diff --cc THANKS
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge