Merge from Jean-Charles

diff --cc ChangeLog
index 11177c44b6586cb5068baf3e6b02b3ddc03eaabb,bb373dc8d66cfe9e411eae97d490c8e8c20ceb83..38de7da045ac8762cdb97b0c549937ab0c3add98
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,3 +1,7 @@@
++  * Updated memcapable to test ASCII protocol.
 +  * Changed behavior so that server can be removed at first sign of failure.
++  * Added memcached_server_get_last_disconnect() call
 +
  0.33 Wed Sep 23 10:11:58 PDT 2009
    * Added memcapable to test servers for binary compatibility.
    * Updated C++ interface. Added basic support for C++ exceptions. Added 

diff --cc libmemcached/memcached_connect.c
Simple merge