Merge branch 'maint'

diff --cc ChangeLog
index 0bb2f694cbe97a8043438204e47d87680968875b,0fe17aba7e7627f4e5243cd03c8404cf9591472f..1cc161b8dacad33e5022a2667a9abb3f636b76db
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
+ 2011-01-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: remove useless requirements from cond36.test
+       * tests/cond36.test ($required): Remove.
+       Since we are at it, add a trailing `:' command.
+ 
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: avoid failing command substitution in errexit mode.
 +      * tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
 +      a command substitution with a nonzero exit status, that causes
 +      IRIX and Tru64/OSF sh to fail the whole test.
 +
  2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
            Stefano Lattarini  <stefano.lattarini@gmail.com>
  

diff --cc tests/cond36.test
index a39ead03d912c6628d37c66afd8f8dda113a9e97,6826cd58f3e90f3dd5f24abcd8d51bfb2350ace1..06d5a604ef11d0900a2fbd875b6aa02871de5f56
--- 1/tests/cond36.test
--- 2/tests/cond36.test
+++ b/tests/cond36.test
@@@ -16,9 -16,10 +16,8 @@@
  
  # Check rules output for parser defined conditionally.
  
- required='flex yacc gcc'
  . ./defs || Exit 1
  
 -set -e
 -
  cat >>configure.in <<'EOF'
  AM_CONDITIONAL([CASE_A], test -z "$case_B")
  AC_PROG_CC