Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc automake.in
index c0bf146878242f608c7cb6f52a94cc1ee27befb2,503c221309997040f62ac98a5c306874fb196963..d5e3ec21c26e6667a38e1f777b284cb309e93f78
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

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

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

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