Merge working tree with build tree.

diff --combined .bzrignore
index 17af0242c341b760270793b3505894fb8f397035,a3cc73e5df7e401c53abda212eb6279cf8093b80..a2a8ce45aebe001a5aa5945ff4388148de68738f
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -71,6 -71,7 +71,6 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
  docs/text
  example/memcached_light
  libhashkit-1.0/configure.h
@@@ -143,3 -144,4 +143,4 @@@ tmp_chroo
  unittests/unittests
  tests/libmemcached-1.0/testsocket
  example/t/memcached_light
+ libtest/abort