Merge of latest - callback commit needed

author <patg@patg.net> <>

Sun, 20 Jan 2008 01:26:24 +0000 (20:26 -0500)

committer <patg@patg.net> <>

Sun, 20 Jan 2008 01:26:24 +0000 (20:26 -0500)
author <patg@patg.net> <>
Sun, 20 Jan 2008 01:26:24 +0000 (20:26 -0500)
committer <patg@patg.net> <>
Sun, 20 Jan 2008 01:26:24 +0000 (20:26 -0500)
diff --cc include/memcached.h
Simple merge
diff --cc tests/function.c
Simple merge
		1	2
include/memcached.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/function.c	patch \|	diff1 \|	diff2 \|	blob \| history