Merge branch 'maint'

Conflicts:
	HACKING

diff --cc ChangeLog
index f113915,1f32e58..e0e8f82
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,16 +1,34 @@@
+ 2010-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Work around a nasty bug (segfault) of Solaris make.
+       * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
+       from $list, to avoid triggering a nasty bug (potential segfault)
+       on Solaris make.
+ 
+ 2010-08-06  Peter Rosin  <peda@lysator.liu.se>
+ 
+       Make cond5.test more robust on MSYS.
+       * tests/cond5.test: Add delay before the first kill attempt to
+       cater for problems with MSYS bash.
+ 
 +2010-08-01  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Wrap some MSVC options in the compile script.
 +      * lib/compile: MSVC supports naming the output file, the option
 +      is just not called -o, so transform -o into the appropriate form
 +      for MSVC. Also wrap some other options while at it (-L, -l, -Wl,
 +      -Xlinker and -I) and convert file names to windows form where
 +      needed for those options to make MSVC more usable in an
 +      autotooled environment.
 +      * doc/automake.texi (Auxiliary Programs): Document the above
 +      extension of the compile script.
 +      * NEWS: Updated.
 +      * tests/defs.in: New required entry 'cl'.
 +      * tests/compile3.test: New test.
 +      * tests/compile4.test: New test.
 +      * tests/compile5.test: New test.
 +      * tests/Makefile.am: Update.
 +
  2010-07-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Add example git work flow; discuss merge --log in HACKING.

diff --cc HACKING
index ad0ae49,2e404f5..38af22e
--- 1/HACKING
--- 2/HACKING
+++ b/HACKING
@@@ -171,9 -168,8 +168,11 @@@
  * Use `keep_testdirs=yes' to keep test directories for successful
    tests also.
  
 +* Use perl coverage information to ensure your new code is thoroughly
 +  tested by your new tests.
 +
+ * See file `tests/README' for more information.
+ 
  ================================================================
  = Release procedure
  

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

diff --cc tests/Makefile.in
Simple merge