Branch merge for fixes in reconnect.

diff --cc ChangeLog
index f3cd040bfd5dc30d01b217a02b8f0bd600bfa32d,199536b56e77d4b6f925aa692602ed50c0739dc2..3a9e3afa546f70d09323267cb462d89b464ac58a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,6 @@@
- 0.17
 +  * Replication support has been added to the library.
 +
+ 0.17 Wed Feb 27 03:33:29 PST 2008
    * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in
      non-block mode.
    * Incompatible change in memcached_behavior_set() api. We now use a

diff --cc include/memcached.h
Simple merge

diff --cc lib/memcached_storage.c
index 3b1ee242ab087747a5faad00b74281054c4a44ac,0b5a73e10b3d45a0912f13c52ca47babf5cfdae7..2a0f88d493f355df2e862af79dfd1c8d8b2b22af
--- 1/lib/memcached_storage.c
--- 2/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@@ -53,14 -53,10 +53,11 @@@ static inline memcached_return memcache
    char to_write;
    size_t write_length;
    ssize_t sent_length;
 -  memcached_return rc;
 +  memcached_return rc[MEMCACHED_MAX_REPLICAS];
    char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
    unsigned int server_key;
 +  uint8_t replicas= 0;
  
-   WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
-   WATCHPOINT_ASSERT(!(value && value_length == 0));
- 
    unlikely (key_length == 0)
      return MEMCACHED_NO_KEY_PROVIDED;