Merge trond from lp:~trond-norbye/libmemcached/bug_396882