Merge branch 'maint'

diff --cc ChangeLog
index 2847a15,a356958..ab8770a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,43 -1,16 +1,56 @@@
  2010-11-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       Fix a bug in variable concatanation with `+='.
+       * lib/Automake/VarDef.pm (append): Since the content of the
+       "appended-to" variable is going to be unconditionally normalized
+       later, simply separate the appended value with a single whitespace
+       character, instead of trying to be uselesssly smarter by using
+       escaped newlines.  This fixes a bug in which extra backslashes
+       where erroneously inserted in the variable's final value.
+       * tests/pluseq11.test: New test, exposing the bug.
+       * tests/Makefile.am (TESTS): Update.
+       Reported by Andy Wingo.
+ 
++2010-11-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      Modernize, improve and/or tweak various test scripts.
 +      * tests/stamph2.test: Improve m4 quoting in `configure.in', and
 +      prefer trailing `:' over trailing `Exit 0'.
 +      * tests/syntax.test: Escape literal dots in grep regexps.
 +      * tests/copy.test: Enable `errexit' shell flag.  Extend test by
 +      checking with `test' utility that the script `install-sh' is
 +      copied, but not symlinked.
 +      * tests/depdist.test: Move setting of `errexit' shell flag earlier
 +      in the script (just after inclusion of ./defs).  Avoid obsoleted
 +      constructs in generated `configure.in'.  Prefer to do our checks
 +      by running configure and make over grepping Makefile.in.
 +      * tests/target-cflags: Move setting of `errexit' shell flag
 +      earlier in the script (just after inclusion of ./defs). Use the
 +      `configure.in' stub created by `./defs', rather than writing it
 +      from scratch.
 +      * tests/target-clash: Do not uselessly run autoconf.
 +      * tests/ctarget1.test: Renamed ...
 +      * tests/cond-basic.test: ... to this.  Use the `configure.in' stub
 +      created by `./defs', rather than writing it from scratch.
 +      Move setting of `errexit' shell flag earlier in the script (just
 +      after inclusion of ./defs).  Other minor cosmetic changes.
 +      * tests/Makefile.am (TESTS): Updated.
 +
 +2010-11-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      New tests on obsoleted usages of automake/autoconf macros (such
 +      as AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT).
 +      * tests/backcompat.test: New test script.
 +      * tests/backcompat2.test: Likewise.
 +      * tests/backcompat3.test: Likewise.
 +      * tests/backcompat4.test: Likewise.
 +      * tests/backcompat5.test: Likewise.
 +      * tests/backcompat6.test: Likewise.
 +      * tests/init.test: Extended and improved, esp. by trying more
 +      combinations of calls to AC_INIT and AM_INIT_AUTOMAKE with few
 +      arguments.
 +      * tests/Makefile.am (TESTS): Updated.
 +
  2010-11-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Fix bug in rules for creating vala vapi/header files.

diff --cc lib/Automake/VarDef.pm
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge