Merging bzr://localhost/libmemcached/994772 to Build branch