Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc automake.in
index 7798bb090cfe239b26a6b665a40356731ba9bb04,845ac7f67b9c0d0ce9eb483008e4f0474557c370..3897de481489d75d8ce8c589fd3a80952d3bf393
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

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

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

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

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

diff --cc lib/am/distdir.am
Simple merge