Merge fix.

diff --cc ChangeLog
index 0c835b88ac6053ac0e09cb8af664ea2527f7f0ec,daa339b9cbcf43e3943ab2c7d2da13280957c69c..46c15ea9e2555a034274f50362419b7e872e431c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,4 +1,8 @@@
- 0.16
 +0.17
 +  * MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT added for connect timeout in
 +    non-block mode.
 +
+ 0.16 Mon Feb 18 00:30:25 PST 2008
    * Work on the UDP protocol
    * Added get_by_key, set_by_key tests for C++ API
    * Fix for limit_maxbytes to be 64bit in stats