Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc automake.in
index 7798bb0,845ac7f..3897de4
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