Merge branch 'maint'

diff --cc ChangeLog
index 5ef4d4e,0328c5a..8c394cc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,28 +1,35 @@@
+ 2010-09-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Test automake-generated portions of configure help screen.
+       * tests/help-depend.test: New test.
+       * tests/help-depend2.test: Likewise.
+       * tests/help-dmalloc.test: Likewise.
+       * tests/help-init.test: Likewise.
+       * tests/help-lispdir.test: Likewise.
+       * tests/help-maintainer.test: Likewise.
+       * tests/help-multilib.test: Likewise.
+       * tests/help-regex.test: Likewise.
+       * tests/help-silent.test: Likewise.
+       * tests/help-upc.test: Likewise.
+       * tests/mmode.test: Remove tests on `configure --help' output,
+       they are supersed by tests in `help-maintainer.test'.
+       * tests/Makefile.am (TESTS): Update.
+ 
+ 2010-09-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       * tests/README: Don't put GCS mandated tools in $required.
+ 
+ 2010-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       * HACKING: Hint at old commits with `git describe' output.
+ 
 +2010-09-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Prefer `$(am__cd)' to plain `cd' in our Makefiles.
 +      * Makefile.am (recheck, dist-hook, git-dist, path-check, fetch)
 +      (release-stats): Use `$(am__cd)' rather than plain `cd'.
 +      * tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise.
 +
  2010-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Fix regression in test `colon4.test'.

diff --cc HACKING
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/README
Simple merge