Merge branch 'maint' into foo

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

Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)

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

Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
diff --cc ChangeLog
Simple merge
diff --cc automake.in

index 4a753db1ec98c1b07360d13a32a8a7027cc59904,b3a2cae05b87dc9d58e9408e8f1d8b5f3a3ce918..e8a97270469b88acd15c361be2ea07e8a8731fa0

mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc doc/automake.texi
Simple merge
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
committer	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
automake.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/automake.texi	patch \|	diff1 \|	diff2 \|	blob \| history