Merge branch 'maint'

author Stefano Lattarini <stefano.lattarini@gmail.com>

Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)

committer Stefano Lattarini <stefano.lattarini@gmail.com>

Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)
author Stefano Lattarini <stefano.lattarini@gmail.com>
Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)
committer Stefano Lattarini <stefano.lattarini@gmail.com>
Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)
diff --cc ChangeLog
Simple merge
diff --cc tests/Makefile.am
Simple merge
diff --cc tests/Makefile.in
Simple merge
diff --cc tests/maintclean-vpath.test
Simple merge
author	Stefano Lattarini <stefano.lattarini@gmail.com>
	Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)
committer	Stefano Lattarini <stefano.lattarini@gmail.com>
	Sat, 23 Apr 2011 09:22:40 +0000 (11:22 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/maintclean-vpath.test	patch \|	diff1 \|	diff2 \|	blob \| history