Merging Trond

diff --combined .bzrignore
index 4b8966e156676baddbf3da7be4120f04b7244168,f629619a6fa0ffe4d0b6bc2b9784227311eb0e16..55777a950e9a087fa15225b3a3d77f3d77b143b7
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -95,10 -95,6 +95,10 @@@ docs/memflush.
  docs/memrm.1
  docs/memslap.1
  docs/memstat.1
 +docs/memcached_set_memory_allocators.3
 +docs/memcached_get_memory_allocators.3
 +docs/memcached_set_user_data.3
 +docs/memcached_get_user_data.3
  libmemcached/.deps
  libmemcached/.libs
  libmemcached/Makefile
@@@ -109,6 -105,7 +109,7 @@@ libmemcached/jenkins_hash.l
  libmemcached/libmemcached.la
  libmemcached/libmemcached_config.h
  libmemcached/libmemcached_config.h.in
+ libmemcached/memcached_configure.h
  libmemcached/md5.lo
  libmemcached/memcached.lo
  libmemcached/memcached_analyze.lo

diff --combined libmemcached/Makefile.am
index 1e3224c08c565b812943526c814ab862e3bd2ec5,4274a5d4d84f3dddc2752a4a8c9b86620ef02db2..463e8ea5dbb542a9b06cbb53aa88f541e548cd8a
--- 1/libmemcached/Makefile.am
--- 2/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@@ -1,4 -1,5 +1,5 @@@
- EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver
+ EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
+              memcached_configure.h.in
  
  BUILT_SOURCES= @DTRACE_HEADER@
  
@@@ -9,7 -10,6 +10,7 @@@ DTRACEFLAGS =           @DTRACEFLAGS
  noinst_HEADERS = libmemcached_probes.h \
                   libmemcached_config.h \
                 memcached_io.h \
 +                 memcached_internal.h \
                   common.h \
                   memcached/protocol_binary.h @DTRACE_HEADER@
  
@@@ -62,8 -62,7 +63,8 @@@ libmemcached_la_SOURCES = crc.c 
                          memcached_verbosity.c \
                          memcached_version.c \
                          murmur_hash.c \
 -                        jenkins_hash.c
 +                        jenkins_hash.c \
 +                          memcached_allocators.c
  
  if INCLUDE_HSIEH_SRC
  libmemcached_la_SOURCES += hsieh_hash.c

diff --combined libmemcached/memcached.h
index 607fb4b6000d7fdbc66fa00a89af47165aef0454,e389c388e67a96f6c75a4add22084dac910bf3fc..3dae65ee5b2cfa4fa06ecb6be42fc2616742a45c
--- 1/libmemcached/memcached.h
--- 2/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@@ -21,6 -21,7 +21,7 @@@
  #ifdef MEMCACHED_INTERNAL
  #include <libmemcached/libmemcached_config.h>
  #endif
+ #include <libmemcached/memcached_configure.h>
  #include <libmemcached/memcached_constants.h>
  #include <libmemcached/memcached_types.h>
  #include <libmemcached/memcached_watchpoint.h>
@@@ -116,7 -117,6 +117,7 @@@ struct memcached_st 
    memcached_free_function call_free;
    memcached_malloc_function call_malloc;
    memcached_realloc_function call_realloc;
 +  memcached_calloc_function call_calloc;
    memcached_trigger_key get_key_failure;
    memcached_trigger_delete_key delete_trigger;
    char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
@@@ -231,29 -231,10 +232,29 @@@ void *memcached_callback_get(memcached_
  memcached_return memcached_dump(memcached_st *ptr, memcached_dump_func *function, void *context, uint32_t number_of_callbacks);
  
  
 +memcached_return memcached_set_memory_allocators(memcached_st *ptr,
 +                                                 memcached_malloc_function mem_malloc,
 +                                                 memcached_free_function mem_free,
 +                                                 memcached_realloc_function mem_realloc,
 +                                                 memcached_calloc_function mem_calloc);
 +
 +void memcached_get_memory_allocators(memcached_st *ptr,
 +                                     memcached_malloc_function *mem_malloc,
 +                                     memcached_free_function *mem_free,
 +                                     memcached_realloc_function *mem_realloc,
 +                                     memcached_calloc_function *mem_calloc);
 +
 +void *memcached_get_user_data(memcached_st *ptr);
 +void *memcached_set_user_data(memcached_st *ptr, void *data);
 +
  #ifdef __cplusplus
  }
  #endif
  
  #include <libmemcached/memcached_storage.h>
  
 +#ifdef MEMCACHED_INTERNAL
 +#include <libmemcached/memcached_internal.h>
 +#endif
 +
  #endif /* __MEMCACHED_H__ */