Merge branch 'maint'

diff --cc ChangeLog
index cd5367cd39fd9406ec7760d2bb29cc2acf30dceb,fbc114e19321eed461f02ad0bf653b7bfb6d187f..92b6ffa01f0d41ce992bc8e9ff2e305266989a32
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,18 +1,26 @@@
+ 2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Automake::Config: remove extra trailing semicolon.
+       * lib/Automake/Config.in: Remove extra trailing semicolon.
+ 
+       help4.test: fix botched heading comment.
+       * tests/help4.test: Fixed the heading comment, since it
+       didn't correctly describe what checks the testcase was
+       supposed to perform.
+ 
+       help2.test: add checks on aclocal too.
+       * tests/help2.test: Check that also `aclocal --version' and
+       `aclocal --help' work with configure.in and acinclude.m4 both
+       broken.
+ 
 +2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      New test on repeated automake options.
 +      * tests/repeated-options.test: New test, check that automake
 +      does not complain on repeated options, nor generate broken or
 +      incorrect makefiles.
 +      * tests/Makefile.am (TESTS): Updated.
 +
  2010-11-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Fix spurious failures of silent-rules tests with Sun Fortran.