Merge branch 'maint'

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

Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)

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

Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)
committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)
diff --cc ChangeLog
Simple merge
diff --cc automake.in
Simple merge
diff --cc doc/automake.texi
Simple merge
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)
committer	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
automake.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/automake.texi	patch \|	diff1 \|	diff2 \|	blob \| history