Merge trunk

diff --combined support/libmemcached.spec.in
index ccfd9a7ee0a15e6906230dedc2864baa585f97af,dedb2497f05cca252e8750f71e33242e5d880b2d..1ee25d76fa93fc3d606af76cfc6936dfbd204bf5
--- 1/support/libmemcached.spec.in
--- 2/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@@ -111,11 -111,11 +111,13 @@@ you will need to install %{name}-devel
  %{_includedir}/libhashkit/digest.h
  %{_includedir}/libhashkit/function.h
  %{_includedir}/libhashkit/hashkit.h
+ %{_includedir}/libhashkit/hashkit.hpp
+ %{_includedir}/libhashkit/str_algorithm.h
  %{_includedir}/libhashkit/strerror.h
  %{_includedir}/libhashkit/types.h
  %{_includedir}/libhashkit/visibility.h
 +%{_includedir}/libhashkit/hashkit.hpp
 +
  %{_includedir}/libmemcached/allocators.h
  %{_includedir}/libmemcached/analyze.h
  %{_includedir}/libmemcached/array.h
@@@ -125,8 -125,6 +127,6 @@@
  %{_includedir}/libmemcached/callback.h
  %{_includedir}/libmemcached/configure.h
  %{_includedir}/libmemcached/constants.h
- %{_includedir}/libhashkit/str_algorithm.h
- %{_includedir}/libmemcached/memcached/vbucket.h
  %{_includedir}/libmemcached/delete.h
  %{_includedir}/libmemcached/dump.h
  %{_includedir}/libmemcached/error.h
@@@ -139,11 -137,12 +139,12 @@@
  %{_includedir}/libmemcached/memcached.h
  %{_includedir}/libmemcached/memcached.hpp
  %{_includedir}/libmemcached/memcached/protocol_binary.h
+ %{_includedir}/libmemcached/memcached/vbucket.h
  %{_includedir}/libmemcached/memcached_util.h
+ %{_includedir}/libmemcached/namespace.h
  %{_includedir}/libmemcached/options.h
  %{_includedir}/libmemcached/parse.h
  %{_includedir}/libmemcached/platform.h
- %{_includedir}/libmemcached/prefix_key.h
  %{_includedir}/libmemcached/protocol/cache.h
  %{_includedir}/libmemcached/protocol/callback.h
  %{_includedir}/libmemcached/protocol_handler.h
@@@ -160,6 -159,7 +161,7 @@@
  %{_includedir}/libmemcached/types.h
  %{_includedir}/libmemcached/util.h
  %{_includedir}/libmemcached/util/flush.h
+ %{_includedir}/libmemcached/util/pid.h
  %{_includedir}/libmemcached/util/ping.h
  %{_includedir}/libmemcached/util/pool.h
  %{_includedir}/libmemcached/util/version.h