Merge branch 'ff/tail'

author Florian Forster <octo@huhu.verplant.org>

Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)

committer Florian Forster <octo@huhu.verplant.org>

Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)
author Florian Forster <octo@huhu.verplant.org>
Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history