Merge in local trunk

author Brian Aker <brian@tangent.org>

Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)

committer Brian Aker <brian@tangent.org>

Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
author Brian Aker <brian@tangent.org>
Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
committer Brian Aker <brian@tangent.org>
Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
diff --cc ChangeLog
Simple merge
diff --cc libmemcached/hosts.cc
Simple merge
diff --cc libmemcached/server.h
Simple merge
author	Brian Aker <brian@tangent.org>
	Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
committer	Brian Aker <brian@tangent.org>
	Tue, 24 May 2011 20:43:14 +0000 (13:43 -0700)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/hosts.cc	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/server.h	patch \|	diff1 \|	diff2 \|	blob \| history