Merge Trond

diff --cc ChangeLog
index 6c9641fc8928e67426ac3424c0a7cc58286109de,6c9641fc8928e67426ac3424c0a7cc58286109de..958cc0fda94a8fac84d22e85ebf0a089c55b9ca2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,6 @@@
++0.33
++  * Added memcapable to test servers for binary compatibility.
++
    0.32 Tue Sep 15 15:49:09 PDT 2009
    * Change of behavior where linger is only modified for no-block and then
      it is set to zero.