Merge branch 'maint'

diff --cc ChangeLog
index 1ceda87,6174ee0..b5f1433
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,13 +1,22 @@@
  2010-06-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       Add useful comment in test script obsolete.test.
+       * tests/obsolte.test: Add a comment explaining why we need
+       an indirection in adding $AUTOUPDATE to $required.
+ 
+       Normalize whitespaces in 'tests/Makefile.am'.
+       * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
+       definition of this variable.
+ 
 +      Parallel tests generation: improve comments (tiny change).
 +      * tests/Makefile.am ($(parallel_tests)): Added useful comment to
 +      generated tests.
 +
 +      Tests defs: truly get rid of `$am_defs_included' (unused variable)
 +       * tests/defs.in ($am_defs_included): Remove, its now unused.  It
 +      should have been removed in a previous changeset, but the removal
 +      was done only partially (oversight).
 +
  2010-06-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Remove a couple of unneeded conditionals from tests.

diff --cc tests/Makefile.am
index 106f4a7,b61e71b..2771a66
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -452,9 -427,8 +452,9 @@@ link_dist.test 
  link_f90_only.test \
  link_fc.test \
  link_fccxx.test \
- link_fcxx.test        \
+ link_fcxx.test \
  link_f_only.test \
 +link_override.test \
  lisp2.test \
  lisp3.test \
  lisp4.test \

diff --cc tests/Makefile.in
index 35245dd,0edcd5b..db53cfb
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -663,9 -665,8 +663,9 @@@ link_dist.test 
  link_f90_only.test \
  link_fc.test \
  link_fccxx.test \
- link_fcxx.test        \
+ link_fcxx.test \
  link_f_only.test \
 +link_override.test \
  lisp2.test \
  lisp3.test \
  lisp4.test \