Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc THANKS
index 54615bec58f20d2bc71e87b9628c4a71af414de7,5789e95eafa7e065ab26200355f914603db13690..71f3faeeb7cf4350bdef2f5b779b281748be41c7
--- 1/THANKS
--- 2/THANKS
+++ b/THANKS
@@@ -64,8 -64,8 +64,9 @@@ danbp                 danpb@nospam.postmaster.co.u
  Daniel Jacobowitz     drow@false.org
  Daniel Kahn Gillmor   dkg@fifthhorseman.net
  Daniel Richard G.     danielg@teragram.com
 +Debarshi Ray          rishi@gnu.org
  Dave Brolley          brolley@redhat.com
+ Dave Korn             dave.korn.cygwin@googlemail.com
  Dave Morrison         dave@bnl.gov
  David A. Swierczek    swiercze@mr.med.ge.com
  David Byron           dbyron@dbyron.com

diff --cc doc/automake.texi
Simple merge

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

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

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge