slight changes on memcached.c
merge conflicts on memcached.c