Merge build trunk.

diff --combined ChangeLog
index f3ab6d6ca69d3bfe8e9777b39532ac4a60eef3bb,450519fd3c31de074b2ca068be7ea6514b1f2d8a..7a60fb070f99c72e99f165007c41f63f2ab43789
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,12 +1,12 @@@
+ 1.0.5
+ 
+ * Version is now parsed directly in the parser, which makes buffered
+ operations now work with it..
+ 
+ * memstat has been extended so that it can be used to find the version of the
+ server.
+ 
+ 
  1.0.4 Thu Jan 26 22:33:54 PST 2012
  * Fix for memcached_dump().
  * Additional testing for memcached_stat_execute().
@@@ -39,7 -48,6 +48,7 @@@
   * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
   * Fix for stats structure.
   * Updates to documentation.
 + * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
  
  0.49 Thu Apr 14 08:43:37 PDT 2011
    * Fix calls to auto methods so that if value is not passed in nothing bad happens.
@@@ -47,6 -55,7 +56,6 @@@
    * New error system.
    * New flow control for messages means faster get/set calls.
    * Added new documentation system.
 -  * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.
    * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.  
    * Added MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS to simplify the setting of AUTO REJECT for servers.