Merge branch 'master' of git://git.tal.org/mapper

author Kaj-Michael Lang <milang@tori.tal.org>

Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)

committer Kaj-Michael Lang <milang@tori.tal.org>

Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)
author Kaj-Michael Lang <milang@tori.tal.org>
Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)
committer Kaj-Michael Lang <milang@tori.tal.org>
Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)
diff --cc src/cb.c
Simple merge
diff --cc src/route.c
Simple merge
author	Kaj-Michael Lang <milang@tori.tal.org>
	Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)
committer	Kaj-Michael Lang <milang@tori.tal.org>
	Fri, 26 Oct 2007 10:28:26 +0000 (13:28 +0300)
		1	2
src/cb.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/route.c	patch \|	diff1 \|	diff2 \|	blob \| history