Merge bug fix by Trond.

author Brian Aker <brian@gaz>

Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)

committer Brian Aker <brian@gaz>

Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)
author Brian Aker <brian@gaz>
Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)
committer Brian Aker <brian@gaz>
Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)
diff --cc libmemcached/memcached_constants.h
Simple merge
diff --cc tests/function.c
Simple merge
author	Brian Aker <brian@gaz>
	Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)
committer	Brian Aker <brian@gaz>
	Thu, 5 Nov 2009 17:09:15 +0000 (09:09 -0800)
		1	2
libmemcached/memcached_constants.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/function.c	patch \|	diff1 \|	diff2 \|	blob \| history