Merge branch 'pluseq-fix' into maint

diff --cc ChangeLog
index e3559dc9f78495e7434944de8a75988704603e5c,3e36f4ddf1b8ee43293b4f3423c1b3b07624f37c..a3569580c8e641b1b3d103d028e5e508d4ceca1a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,16 +1,24 @@@
+ 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-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Fix bug in rules for creating vala vapi/header files.
 +      * automake.in (lang_vala_finish_target): Add forgotten "fi" in an
 +      if control structure in a generated make rules.  Bug introduced
 +      by previous commit `v1.11-221-gd7c1679', and revealed by failure
 +      of test `vala2.test'.
 +
  2010-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fix and document rules to not touch the tree with `make -n'.