Merge branch 'maint'

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

Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)

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

Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)
author Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)
committer Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)
diff --cc ChangeLog
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc lib/am/distdir.am
Simple merge
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)
committer	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
lib/am/distdir.am	patch \|	diff1 \|	diff2 \|	blob \| history