Merged from Padraig.

diff --combined libmemcached/memcached.h
index 1293eefbbe1db6db97a331fb6c497906ce58d3de,3c39154423f830b8f7687b4596b785ad70ce45da..c3b436bf2ff721481d5e1bf41de99f01d433ced4
--- 1/libmemcached/memcached.h
--- 2/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@@ -33,7 -33,7 +33,7 @@@ extern "C" 
  #endif
  
  #define MEMCACHED_VERSION_STRING_LENGTH 24
- #define LIBMEMCACHED_VERSION_STRING "0.30"
+ #define LIBMEMCACHED_VERSION_STRING "0.31"
  
  struct memcached_analysis_st {
    uint32_t average_item_size;
@@@ -163,7 -163,7 +163,7 @@@ void memcached_stat_free(memcached_st *
  LIBMEMCACHED_API
  memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
  LIBMEMCACHED_API
- memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, 
+ memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args, 
                                             char *hostname, unsigned int port);
  LIBMEMCACHED_API
  memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
@@@ -172,7 -172,7 +172,7 @@@ memcached_return memcached_verbosity(me
  LIBMEMCACHED_API
  void memcached_quit(memcached_st *ptr);
  LIBMEMCACHED_API
 -char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 +const char *memcached_strerror(memcached_st *ptr, memcached_return rc);
  LIBMEMCACHED_API
  memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);
  LIBMEMCACHED_API
@@@ -235,10 -235,10 +235,10 @@@ LIBMEMCACHED_AP
  memcached_server_st *memcached_servers_parse(const char *server_strings);
  
  LIBMEMCACHED_API
- char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, 
+ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                 const char *key, memcached_return *error);
  LIBMEMCACHED_API
- char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
+ char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                  memcached_return *error);
  
  LIBMEMCACHED_API