Merge from Monty

diff --cc libmemcached/include.am
index ca20cd9b6ffafda1142d0120a41ebe450be72200,9150b08139b241ab620c37a6a629c28da5f8a859..29a77538fc8421bca888ef86e1b8649e4fe7ee04
--- 1/libmemcached/include.am
--- 2/libmemcached/include.am
+++ b/libmemcached/include.am
@@@ -55,46 -55,54 +55,54 @@@ libmemcached_libmemcachedprotocol_la_SO
  
  libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
  
- noinst_LTLIBRARIES+= libmemcached/libmemcachedcallbacks.la
+ noinst_LTLIBRARIES+= \
 -      libmemcached/libmemcachedcallbacks.la
++                   libmemcached/libmemcachedcallbacks.la
+ 
  libmemcached_libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
  libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
  
 -      libmemcached/libmemcachedinternal.la
+ # This noinst lib contains things we want to be ABI private but still want to
+ # either use in client programs or be able to test in test cases
+ # These symbols will not be exposed in the shipped .so
+ noinst_LTLIBRARIES+= \
++                   libmemcached/libmemcachedinternal.la
+ libmemcached_libmemcachedinternal_la_SOURCES = libmemcached/string.c
+ 
  lib_LTLIBRARIES+= libmemcached/libmemcached.la
  libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
  libmemcached_libmemcached_la_SOURCES = \
 -      libmemcached/allocators.c \
 -      libmemcached/analyze.c \
 -      libmemcached/auto.c \
 -      libmemcached/behavior.c \
 -      libmemcached/connect.c \
 -      libmemcached/crc.c \
 -      libmemcached/delete.c \
 -      libmemcached/do.c \
 -      libmemcached/dump.c \
 -      libmemcached/fetch.c \
 -      libmemcached/flush.c \
 -      libmemcached/flush_buffers.c \
 -      libmemcached/get.c \
 -      libmemcached/hash.c \
 -      libmemcached/hosts.c \
 -      libmemcached/io.c \
 -      libmemcached/jenkins_hash.c \
 -      libmemcached/key.c \
 -      libmemcached/md5.c \
 -      libmemcached/memcached.c \
 -      libmemcached/murmur_hash.c \
 -      libmemcached/parse.c \
 -      libmemcached/purge.c \
 -      libmemcached/quit.c \
 -      libmemcached/response.c \
 -      libmemcached/result.c \
 -      libmemcached/server.c \
 -      libmemcached/stats.c \
 -      libmemcached/storage.c \
 -      libmemcached/strerror.c \
 -      libmemcached/verbosity.c \
 -      libmemcached/version.c
 +                                     libmemcached/allocators.c \
 +                                     libmemcached/analyze.c \
 +                                     libmemcached/auto.c \
 +                                     libmemcached/behavior.c \
 +                                     libmemcached/connect.c \
 +                                     libmemcached/crc.c \
 +                                     libmemcached/delete.c \
 +                                     libmemcached/do.c \
 +                                     libmemcached/dump.c \
 +                                     libmemcached/fetch.c \
 +                                     libmemcached/flush.c \
 +                                     libmemcached/flush_buffers.c \
 +                                     libmemcached/get.c \
 +                                     libmemcached/hash.c \
 +                                     libmemcached/hosts.c \
 +                                     libmemcached/io.c \
 +                                     libmemcached/jenkins_hash.c \
 +                                     libmemcached/key.c \
 +                                     libmemcached/md5.c \
 +                                     libmemcached/memcached.c \
 +                                     libmemcached/murmur_hash.c \
 +                                     libmemcached/parse.c \
 +                                     libmemcached/purge.c \
 +                                     libmemcached/quit.c \
 +                                     libmemcached/response.c \
 +                                     libmemcached/result.c \
 +                                     libmemcached/server.c \
 +                                     libmemcached/stats.c \
 +                                     libmemcached/storage.c \
 +                                     libmemcached/strerror.c \
-                                      libmemcached/string.c \
 +                                     libmemcached/verbosity.c \
 +                                     libmemcached/version.c
  
  
  if INCLUDE_HSIEH_SRC