Merged from trunk.

diff --cc .bzrignore
index 0000000000000000000000000000000000000000,de3ea517b19c43056d63687dc238d65d54468871..ec482541f533de29a20422741be178e95bb549d0
mode 000000,100644..100644
--- /dev/null
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -1,0 -1,160 +1,165 @@@
+ INSTALL
+ Makefile
+ Makefile.in
+ aclocal.m4
+ autom4te.cache
+ config.log
+ config.status
+ configure
+ libtool
+ clients/.deps
+ clients/.libs
+ clients/Makefile
+ clients/Makefile.in
+ clients/memcat
+ clients/memcp
+ clients/memdump
+ clients/memerror
+ clients/memflush
+ clients/memrm
+ clients/memslap
+ clients/memstat
+ config/config.guess
+ config/config.sub
+ config/depcomp
+ config/install-sh
+ config/ltmain.sh
+ config/missing
+ docs/Makefile
+ docs/Makefile.in
+ docs/libmemcached.3
+ docs/libmemcached_examples.3
+ docs/libmemcachedutil.3
+ docs/memcached_add.3
+ docs/memcached_add_by_key.3
+ docs/memcached_analyze.3
+ docs/memcached_append.3
+ docs/memcached_append_by_key.3
+ docs/memcached_behavior_get.3
+ docs/memcached_behavior_set.3
+ docs/memcached_callback_get.3
+ docs/memcached_callback_set.3
+ docs/memcached_cas.3
+ docs/memcached_cas_by_key.3
+ docs/memcached_clone.3
+ docs/memcached_create.3
+ docs/memcached_decrement.3
+ docs/memcached_decrement_with_initial.3
+ docs/memcached_delete.3
+ docs/memcached_delete_by_key.3
+ docs/memcached_dump.3
+ docs/memcached_fetch.3
+ docs/memcached_fetch_execute.3
+ docs/memcached_fetch_result.3
+ docs/memcached_flush_buffers.3
+ docs/memcached_free.3
+ docs/memcached_generate_hash_value.3
+ docs/memcached_get.3
+ docs/memcached_get_by_key.3
+ docs/memcached_increment.3
+ docs/memcached_increment_with_initial.3
+ docs/memcached_lib_version.3
+ docs/memcached_mget.3
+ docs/memcached_mget_by_key.3
+ docs/memcached_pool_create.3
+ docs/memcached_pool_destroy.3
+ docs/memcached_pool_pop.3
+ docs/memcached_pool_push.3
+ docs/memcached_prepend.3
+ docs/memcached_prepend_by_key.3
+ docs/memcached_quit.3
+ docs/memcached_replace.3
+ docs/memcached_replace_by_key.3
+ docs/memcached_server_add.3
+ docs/memcached_server_count.3
+ docs/memcached_server_list.3
+ docs/memcached_server_list_append.3
+ docs/memcached_server_list_count.3
+ docs/memcached_server_list_free.3
+ docs/memcached_server_push.3
+ docs/memcached_servers_parse.3
+ docs/memcached_set.3
+ docs/memcached_set_by_key.3
+ docs/memcached_stat.3
+ docs/memcached_stat_get_keys.3
+ docs/memcached_stat_get_value.3
+ docs/memcached_stat_servername.3
+ docs/memcached_strerror.3
+ docs/memcached_verbosity.3
+ docs/memcached_version.3
+ docs/memcat.1
+ docs/memcp.1
+ docs/memdump.1
+ docs/memerror.1
+ docs/memflush.1
+ docs/memrm.1
+ docs/memslap.1
+ docs/memstat.1
+ libmemcached/.deps
+ libmemcached/.libs
+ libmemcached/Makefile
+ libmemcached/Makefile.in
+ libmemcached/byteorder.lo
+ libmemcached/crc.lo
+ libmemcached/jenkins_hash.lo
+ libmemcached/libmemcached.la
+ libmemcached/libmemcached_config.h
+ libmemcached/libmemcached_config.h.in
+ libmemcached/md5.lo
+ libmemcached/memcached.lo
+ libmemcached/memcached_analyze.lo
+ libmemcached/memcached_auto.lo
+ libmemcached/memcached_behavior.lo
+ libmemcached/memcached_callback.lo
+ libmemcached/memcached_connect.lo
+ libmemcached/memcached_delete.lo
+ libmemcached/memcached_do.lo
+ libmemcached/memcached_dump.lo
+ libmemcached/memcached_fetch.lo
+ libmemcached/memcached_flush.lo
+ libmemcached/memcached_flush_buffers.lo
+ libmemcached/memcached_get.lo
+ libmemcached/memcached_hash.lo
+ libmemcached/memcached_hosts.lo
+ libmemcached/memcached_io.lo
+ libmemcached/memcached_key.lo
+ libmemcached/memcached_parse.lo
+ libmemcached/memcached_purge.lo
+ libmemcached/memcached_quit.lo
+ libmemcached/memcached_response.lo
+ libmemcached/memcached_result.lo
+ libmemcached/memcached_server.lo
+ libmemcached/memcached_stats.lo
+ libmemcached/memcached_storage.lo
+ libmemcached/memcached_strerror.lo
+ libmemcached/memcached_string.lo
+ libmemcached/memcached_verbosity.lo
+ libmemcached/memcached_version.lo
+ libmemcached/murmur_hash.lo
+ libmemcached/stamp-h1
+ libmemcachedutil/.deps
+ libmemcachedutil/.libs
+ libmemcachedutil/Makefile
+ libmemcachedutil/Makefile.in
+ libmemcachedutil/libmemcachedutil.la
+ libmemcachedutil/memcached_pool.lo
+ support/Makefile
+ support/Makefile.in
+ support/libmemcached-fc.spec
+ support/libmemcached.pc
+ support/libmemcached.spec
+ tests/.deps
+ tests/.libs
+ tests/Makefile
+ tests/Makefile.in
+ tests/atomsmasher
+ tests/output.cmp
+ tests/startservers
+ tests/testapp
+ tests/testplus
+ tests/udptest
++m4/lt~obsolete.m4
++m4/ltoptions.m4
++m4/ltsugar.m4
++m4/ltversion.m4
++m4/libtool.m4