Merge branch 'maint'

diff --cc ChangeLog
index 2e7b05050c892a2e8b511cbe1edc67c9615d301c,5ba7777b660b70f77c058f240ee009f5337f8bd5..3abddcc0ac6d195b24bbab2f7f7a2bf6f8eca0ab
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,16 +1,38 @@@
+ 2010-11-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       tests: avoid '##'-style comments inside recipe commands.
+       * tests/confh.test, tests/confh8.test: Remove
+       double-hash comments from makefile rule commands, they
+       are not part of the Automake API.
+ 
+ 2010-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       tests: work around dash quoting issue in case statements.
+       * tests/color.test, tests/color2.test: Quote variable in case
+       pattern, to avoid skipping tests with dash 0.5.5.1.
+ 
 +2010-11-16  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Skip MSVC oriented tests if the shell is not capable.
 +      * tests/defs: New required entry 'xsi-shell'.
 +      * tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
 +      Require a XSI capable shell.
 +      Reported by Ralf Wildenhues.
 +
 +2010-11-15  Peter Rosin  <peda@lysator.liu.se>
 +
 +      compile: clear the `eat' variable earlier.
 +      * lib/compile: Clear the `eat' variable earlier.
 +      ($scriptversion): Update.
 +      * tests/compile3.test: Prevent regressions.
 +
 +2010-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      More stable configure output from sanity check.
 +      * m4/sanity.m4 (AM_SANITY_CHECK): Always print check line
 +      about ensuring newer files, even if we don't actually need
 +      to wait any more.
 +
  2010-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Rebuild menus in the manual.