Merging branches

author <brian@localhost.localdomain> <>

Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)

committer <brian@localhost.localdomain> <>

Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)
author <brian@localhost.localdomain> <>
Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)
committer <brian@localhost.localdomain> <>
Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)
diff --cc libmemcached/common.h
Simple merge
diff --cc libmemcached/memcached_hosts.c
Simple merge
diff --cc libmemcached/memcached_watchpoint.h
Simple merge
author	<brian@localhost.localdomain> <>
	Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)
committer	<brian@localhost.localdomain> <>
	Sun, 20 Apr 2008 16:09:57 +0000 (09:09 -0700)
		1	2
libmemcached/common.h	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/memcached_hosts.c	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/memcached_watchpoint.h	patch \|	diff1 \|	diff2 \|	blob \| history