Merge branch 'maint'

diff --cc ChangeLog
index dba98e4,cbc0415..3c9e0e4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,18 +1,32 @@@
+ 2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
+       * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
+       Test file readability before redirecting input from it, to avoid
+       exiting Tru64/OSF 5.1 sh which treats read as special builtin.
+       * tests/parallel-tests-unreadable-log.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+ 
+ 2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       * NEWS, README: Update copyright years.
+ 
 +2011-01-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: hard error in case of internal failures or signal caught
 +      * tests/defs: Exit with status 99 (hard error) rather than
 +      1 (failure) on unexpected/internal errors, or when a signal
 +      is caught by the client script.
 +
 +      Tests defs: don't let useless variables leak in test scripts.
 +      * tests/defs ($priv_check_temp, $overwrite_status, $ro_dir_temp,
 +      $create_status, $r2h, $libtool_found, $gettext_found, $aclocaldir,
 +      $extra_includes): Unset once they've served their purpose.
 +
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
        Fix parallel-tests.test failure with HP-UX make.
        * tests/parallel-tests.test: Sleep inside inner tests, so logs
        are newer than logs of tests they depend on, for HP-UX make.

diff --cc NEWS
index bbc177d,b5cb6e9..a5dc93f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -100,23 -54,8 +100,26 @@@ Bugs fixed in 1.11a
      make bug triggered by sources containing repeated slashes when the
      `subdir-objects' option was used.
  
 +  - Automake now detects the presence of the `-d' flag in the various
 +    `*YFLAGS' variables even when their definitions involve indirections
 +    through other variables, such as in:
 +      foo_opts = -d
 +      AM_YFLAGS = $(foo_opts)
 +
 +  - Automake now complains if a `*YFLAGS' variable has any conditional
 +    content, not only a conditional definition.
 +
 +  - Explicit enabling and/or disabling of Automake warning categories
 +    through the `-W...' options now always takes precedence over the
 +    implicit warning level implied by Automake strictness (foreign, gnu
 +    or gnits),  regardless of the order in which such strictness and
 +    warning flags appear.  For example, a setting like:
 +      AUTOMAKE_OPTIONS = -Wall --foreign
 +    will cause the warnings in category `portability' to be enabled, even
 +    if those warnings are by default disabled in `foreign' strictness.
++
+   - The parallel-tests driver now does not produce erroneous results
+     with Tru64/OSF 5.1 sh upon unreadable log files any more.
  \f
  New in 1.11:
  

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge