Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 0851e63fa0f726accb06acd25c7be8d430682a14,7ce9efd57c9da12e046f42aa9de52eb7bff2afdb..3253fc5b5a0af95d5025416954e9623c32cbb7d7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,19 -1,9 +1,21 @@@
 -New in 1.11.0a:
 +New in 1.11a:
  
 -Bugs fixed in 1.11.0a:
 +* Changes to automake:
 +
 +  - automake now generates silenced rules for texinfo outputs.
 +
 +* New targets:
 +
 +  - New `cscope' target to build a cscope database for the source tree.
 +
 +* Miscellaneous changes:
 +
 +  - The `dist' and `dist-all' targets now can run compressors in parallel.
 +
 +Bugs fixed in 1.11a:
  
+   - Lots of minor bugfixes.
+ 
  * Bugs introduced by 1.11:
  
    - The `parallel-tests' test driver works around a GNU make 3.80 bug with