Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 9b2ef13f5a9850d7ff6b6478cc897b02e6cb8b43,c3bb3ab474461f88e8ad42a0416b691607635961..10b6f618ff2cbe49139df6c5a534cdc11c2bd290
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,12 +1,12 @@@
 -New in 1.11.0a:
 +New in 1.11a:
  
 -Bugs fixed in 1.11.0a:
 +Bugs fixed in 1.11a:
  
+ * Bugs introduced by 1.11:
+ 
+   - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+     trailing white space in the test list (`TESTS = foo $(EMPTY)').
+ 
  * Long standing bugs:
  
    - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'

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

diff --cc tests/Makefile.in
Simple merge