Merge branch 'maint'

author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)

committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc automake.in

index 3897de481489d75d8ce8c589fd3a80952d3bf393,6b36ae2fc481568e0687c5b126c9b50dd9a982cc..9cbe6c16901251924a1f7b258cfd77c5812178c8

mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc lib/Automake/tests/Makefile.in
Simple merge
diff --cc tests/Makefile.in
Simple merge
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
committer	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 2 Oct 2010 16:43:01 +0000 (18:43 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
automake.in	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Automake/tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history