Merge branch 'yacc-work'

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

Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)

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

Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)
author Stefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)
committer Stefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)
diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc automake.in

index 3403c9668286b633d4656ebbea7ed2d3daed2f10,fa458d6f0e7f0b86566859861b593293d125cff0..1d4601b1f11e491782c64db71fbe061fb20c77ed

mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
diff --cc tests/Makefile.am
Simple merge
diff --cc tests/Makefile.in
Simple merge
author	Stefano Lattarini <stefano.lattarini@gmail.com>
	Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)
committer	Stefano Lattarini <stefano.lattarini@gmail.com>
	Tue, 11 Jan 2011 00:00:13 +0000 (01:00 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
automake.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history