Merge in trond.

diff --cc configure.ac
Simple merge

diff --cc tests/hashkit_functions.c
index d1f846e74f324c2326e8380348fe582533e68d07,53c94b59c3eb3dbde9313d97da396039b16fc91e..deb5436a1570cf5961579aa48b704b7a02047801
--- 1/tests/hashkit_functions.c
--- 2/tests/hashkit_functions.c
+++ b/tests/hashkit_functions.c
@@@ -248,10 -257,11 +257,12 @@@ static test_return_t hsieh_run (hashkit
    return TEST_SUCCESS;
  }
  
- static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused)))
+ static test_return_t murmur_run (hashkit_st *hashk)
  {
+   (void)hashk;
+ 
  #ifdef WORDS_BIGENDIAN
 +  (void)murmur_values;
    return TEST_SKIPPED;
  #else
    uint32_t x;

diff --cc tests/mem_functions.c
index 357ea23760d4380ec95b644733e4242e6b8edeff,48b254dbfcf921de08f853e0af9cd2d303e04961..b5bd08809f4266841826424e6fe95f492de28b1f
--- 1/tests/mem_functions.c
--- 2/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@@ -4835,20 -4859,7 +4863,20 @@@ static test_return_t hsieh_avaibility_t
    return TEST_SUCCESS;
  }
  
- static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused)))
 +static test_return_t murmur_avaibility_test (memcached_st *memc)
 +{
 +  memcached_return_t expected_rc= MEMCACHED_FAILURE;
 +#ifdef HAVE_MURMUR_HASH
 +  expected_rc= MEMCACHED_SUCCESS;
 +#endif
 +  memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH,
 +                                                (uint64_t)MEMCACHED_HASH_MURMUR);
 +  test_true(rc == expected_rc);
 +
 +  return TEST_SUCCESS;
 +}
 +
+ static test_return_t one_at_a_time_run (memcached_st *memc)
  {
    uint32_t x;
    const char **ptr;
@@@ -4977,10 -4995,9 +5012,10 @@@ static test_return_t hsieh_run (memcach
    return TEST_SUCCESS;
  }
  
- static test_return_t murmur_run (memcached_st *memc __attribute__((unused)))
+ static test_return_t murmur_run (memcached_st *memc)
  {
  #ifdef WORDS_BIGENDIAN
 +  (void)murmur_values;
    return TEST_SKIPPED;
  #else
    uint32_t x;