Merge trunk for LP

diff --combined .bzrignore
index 1757c6a6be57d6eaf3419de7c9263a18a9db7115,8f970c350d67533b23a483c037380f6774de72f5..4c52adb65793e8cad77582cc519ddbd5b1ec15b9
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -57,7 -57,7 +57,7 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
 +docs/conf.py
  example/memcached_light
  libhashkit/configure.h
  libmemcached-*.tar.gz
@@@ -99,3 -99,8 +99,8 @@@ tests/testplu
  tests/testudp
  tests/var/
  unittests/unittests
+ libtest/wait
+ docs/text
+ docs/changes
+ tests/cycle
+ libtest/unittest

diff --combined ChangeLog
index 969eda068562df7b06fc7d7b5b9bec787a5a39a6,2c62d617e3b37d20110fb2c75f8acd0787993772..f522e4ce3b221bae924ac26fa3627c0a60b51739
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,14 +1,15 @@@
+ 0.51
+ 
+   * memcached_callback_set() now takes its data argument as const
+ 
+ 
  0.50 Mon Jun 20 10:36:57 PDT 2011
   * Updates to C++ interface 
   * Custom free allocators need to now check for value before calling free.
   * 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.
@@@ -12,6 -16,7 +17,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.