Merge from trunk

author Alex Rousskov <rousskov@measurement-factory.com>

Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)

committer Alex Rousskov <rousskov@measurement-factory.com>

Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)
author Alex Rousskov <rousskov@measurement-factory.com>
Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)
committer Alex Rousskov <rousskov@measurement-factory.com>
Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)
diff --cc configure.in

index c73f2dbb65423fb0cd4b005a9d7b2914b3121897,fb69fb278688a1e78cac86b3e5c2ffb5b7908014..ac34b2d268399bb8e66c22a887f2c1b5b3ee5acb

mode 100644,100755..100755
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
diff --cc src/Server.h
Simple merge
diff --cc src/cache_cf.cc
Simple merge
diff --cc src/cf.data.pre
Simple merge
author	Alex Rousskov <rousskov@measurement-factory.com>
	Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Fri, 6 Jun 2008 15:31:46 +0000 (09:31 -0600)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Server.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	patch \|	diff1 \|	diff2 \|	blob \| history