Merge branch 'rbtree'

author Willy Tarreau <w@1wt.eu>

Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)

committer Willy Tarreau <w@1wt.eu>

Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)
author Willy Tarreau <w@1wt.eu>
Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)
committer Willy Tarreau <w@1wt.eu>
Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)
diff --cc Makefile
Simple merge
diff --cc src/cfgparse.c
Simple merge
diff --cc src/haproxy.c
Simple merge
author	Willy Tarreau <w@1wt.eu>
	Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)
committer	Willy Tarreau <w@1wt.eu>
	Sun, 7 Jan 2007 01:17:18 +0000 (02:17 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/cfgparse.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/haproxy.c	patch \|	diff1 \|	diff2 \|	blob \| history