Merge branch 'maint'

diff --cc ChangeLog
index 0db0574,48c6e79..9c29305
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,24 +1,37 @@@
+ 2010-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix regression in test `colon4.test'.
+       * tests/colon4.test: Fix botched editing to `configure.in'
+       that made the test useless.  Since we are at it, improve
+       comments and make grepping of generated Makefile.in slighty
+       stricter.
+       Regression introduced by change "Modernize, improve and/or
+       extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
+ 
+ 2010-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Do not require "gzip" explicitly in tests.
+       The gzip utility is simply expected to be present on any decent
+       target system for Automake.  So it's pointless to put it in
+       $required.
+       * tests/install2.test ($required): Do not require "gzip".
+       * tests/lex3.test: Likewise.
+       * tests/pr9.test: Likewise.
+       From a suggestion by Ralf Wildenhues.
+ 
 +2010-09-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Use AS_HELP_STRING in AM_SILENT_RULES.
 +      * m4/silent.m4 (AM_SILENT_RULES): Use `AS_HELP_STRING' to format
 +      help message regarding configure options `--enable-silent-rules'
 +      and `--disable-silent-rules'.  Also throw in a couple of cosmetic
 +      changes in the related `case' statement (indentation, balancing
 +      of parentheses).
 +      * THANKS: Update.
 +      From a report by Jeff A. Daily.
 +
 +2010-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
        Make some `confh*.test' tests more "semantic" (plus tweakings).
        * tests/confh.test: Run "autoconf", "configure" and "make check",
        instead of munging/grepping the generated `Makefile.in'.