Merge branch 'maint'

* maint:
  cosmetics: fix typos in recent ChangeLog entries

diff --cc ChangeLog
index 1436482,f1e10c2..d3434ef
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,4 +1,21 @@@
- 2011-06-23   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +2011-06-29   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: explain why AM_TESTS_ENVIRONMENT must be semicolon-terminated
 +      * doc/automake.texi (Simple Tests using parallel-tests): Ditto, and
 +      related adjustments.
 +      Suggestion by Ralf Wildenhues.
 +
 +2011-06-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: fix unportable example of AM_TESTS_ENVIRONMENT usage
 +      * doc/automake.texi (Simple Tests using parallel-tests): The
 +      old example on AM_TESTS_ENVIRONMENT relied on unportable shell
 +      features, and in particular didn't work with various Korn
 +      Shells (see also commit `v1.11-925-g29ca903').  Give another
 +      example, simpler this time, but still inspired to real-world
 +      usage (the GNU coreutils testsuite).
 +
+ 2011-06-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        docs: avoid a footnote, some related rewordings and improvements
        * doc/automake.texi (Dist): Reword the part about automatically