Merge

diff --combined ChangeLog
index 8e243d9841753917f3caf94c4870ffbfbb3b5991,2e1f68ee62551d090032dc6dfd7ccf6858b77933..0ba34231eb6a550b67386f0674a2e17ea2e249c7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,7 @@@
- 
+ 1.0 
  * Dropped libmemcached/memcached_util.h (undocumented header file)
+ * Added memcached_touch() and memcached_touch_by_key()
+ * UDP support restructured to toggle on a complete memcached_st structure.
  
  0.53 Mon Sep 26 20:50:33 PDT 2011
    * Fix for FreeBSD/OpenBSD and -lm
@@@ -24,7 -26,6 +26,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.
@@@ -32,6 -33,7 +34,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.