Handling merge

diff --cc libmemcached/common.h
index d496cf773e3c759a7b688d97778abba19618e6ac,90c8a140b7e3ef4b41013de55b30093261712ad2..ea2c557498798ba724895df14452da89851daaf1
--- 1/libmemcached/common.h
--- 2/libmemcached/common.h
+++ b/libmemcached/common.h
@@@ -113,7 -115,9 +115,11 @@@ memcached_return memcachd_key_test(cha
  
  memcached_return run_distribution(memcached_st *ptr);
  
 +uint32_t generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm);
 +
  uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
+ 
+ extern uint64_t ntohll(uint64_t);
+ extern uint64_t htonll(uint64_t);
+ 
  #endif /* __COMMON_H__ */