Merge branch 'test-repeated-options'

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

Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)

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

Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)
author Stefano Lattarini <stefano.lattarini@gmail.com>
Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)
committer Stefano Lattarini <stefano.lattarini@gmail.com>
Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)
diff --cc ChangeLog
Simple merge
diff --cc tests/Makefile.am
Simple merge
diff --cc tests/Makefile.in
Simple merge
author	Stefano Lattarini <stefano.lattarini@gmail.com>
	Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)
committer	Stefano Lattarini <stefano.lattarini@gmail.com>
	Fri, 19 Nov 2010 20:20:03 +0000 (21:20 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history