Merge Trond --without-docs

diff --cc tests/include.am
index 648751159842542813ce1b4b9a22003c535bd4b2,7a9c206284d6824531cac8fde75c01c29cd5691e..501939df05b3506817138fcde717f77e23643543
--- 1/tests/include.am
--- 2/tests/include.am
+++ b/tests/include.am
@@@ -91,14 -91,14 +91,14 @@@ tests_memplus_LDADD = $(tests_memplus_D
  
  test: check
  
- check-local: test-docs test-mem test-hash memcapable
+ check-local: $(TEST_DOCS) test-mem test-hash memcapable
 -      echo "Tests completed"
 +      @echo "Tests completed"
  
  test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
 -      echo "Tests completed"
 +      @echo "Tests completed"
  
  memcapable: clients/memcapable
 -      @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
 +      @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
        @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
        @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
        @rm tests/Xumemc.pid