Merging Trond

diff --combined libmemcached/memcached.h
index 7c25fb3c9db9d15891e1a6f30d6e201fcfc8ec6b,5d58acbf27dce03a22ec53f4b7adf26818a34ecb..225b20990d1f2d6a4bec4de5cb1e8781b3fc8908
--- 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.33"
 +#define LIBMEMCACHED_VERSION_STRING "0.34"
  
  struct memcached_analysis_st {
    uint32_t average_item_size;
@@@ -113,6 -113,7 +113,7 @@@ struct memcached_st 
    memcached_trigger_delete_key delete_trigger;
    char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
    uint32_t number_of_replicas;
+   memcached_callback_st *callbacks;
  };
  
  LIBMEMCACHED_API