Merge in trunk

diff --combined ChangeLog
index e61d72806695989ff51fe2086def87ca6ff880c0,6a5ca9d93a055dda213bf01c9d0088603ac376cf..c4bc32debae29a703dc66909a04dee5426877627
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,4 @@@
  1.0.3
- * Change default distribution to be consistent
  
  1.0.2 Mon Oct 24 08:00:48 PDT 2011
  * Dropped libmemcached/memcached_util.h (undocumented header file)
@@@ -29,7 -28,6 +28,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.
@@@ -37,6 -35,7 +36,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.