Merge Jean-Charles

diff --cc ChangeLog
index bb373dc8d66cfe9e411eae97d490c8e8c20ceb83,bb373dc8d66cfe9e411eae97d490c8e8c20ceb83..11177c44b6586cb5068baf3e6b02b3ddc03eaabb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,5 @@@
++  * Changed behavior so that server can be removed at first sign of failure.
++
  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