Merge branch 'maint'

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

Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)

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

Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)
committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)
diff --cc ChangeLog
Simple merge
diff --cc HACKING
Simple merge
diff --cc THANKS
Simple merge
diff --cc doc/automake.texi
Simple merge
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)
committer	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sat, 31 Jul 2010 15:02:43 +0000 (17:02 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
HACKING	patch \|	diff1 \|	diff2 \|	blob \| history
THANKS	patch \|	diff1 \|	diff2 \|	blob \| history
doc/automake.texi	patch \|	diff1 \|	diff2 \|	blob \| history