Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc doc/Makefile.am
Simple merge

diff --cc doc/Makefile.in
Simple merge

diff --cc lib/Automake/Makefile.am
Simple merge

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

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

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

diff --cc lib/Makefile.in
Simple merge

diff --cc lib/am/Makefile.in
Simple merge

diff --cc m4/Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge