Merge in touch/etc

diff --combined .bzrignore
index 8432fe194ba45d4a528bb6aad1961ede81733500,dedeb4cbd6e90bc7fb3988d0fdd555ae28198dcf..dbe3e8943e3ec736662fdf864b90187e76e5abcf
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -70,11 -70,12 +70,11 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
  docs/text
  example/memcached_light
- libhashkit/configure.h
+ libhashkit-1.0/configure.h
  libmemcached-?.??/
- libmemcached/configure.h
+ libmemcached-1.0/configure.h
  libmemcached/dtrace_probes.h
  libmemcached/generated_probes.h
  libmemcached/memcached_configure.h
@@@ -135,3 -136,6 +135,6 @@@ tests/memsta
  tests/memcat
  clients/memexist
  tests/memexist
+ libmemcached/configure.h
+ clients/memtouch
+ tests/memtouch

diff --combined ChangeLog
index 29f628250ea7a08fa98d14ee1af0d4d6d31a126e,a073b4fa1f4956a54811dad3b30acd95e582d7b5..8e243d9841753917f3caf94c4870ffbfbb3b5991
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,6 +1,6 @@@
+ 
+ * Dropped libmemcached/memcached_util.h (undocumented header file)
+ 
  0.53 Mon Sep 26 20:50:33 PDT 2011
    * Fix for FreeBSD/OpenBSD and -lm
    * Added memcached_exist()
@@@ -21,7 -24,6 +24,7 @@@
   * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
   * Fix for stats structure.
   * Updates to documentation.
 + * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
  
  0.49 Thu Apr 14 08:43:37 PDT 2011
    * Fix calls to auto methods so that if value is not passed in nothing bad happens.
@@@ -29,6 -31,7 +32,6 @@@
    * New error system.
    * New flow control for messages means faster get/set calls.
    * Added new documentation system.
 -  * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.
    * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.  
    * Added MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS to simplify the setting of AUTO REJECT for servers.