Merge with build trunk.

diff --combined .bzrignore
index 0ffd2ab565a7d54385ea416a8d3ec44cba152938,d3ff77afe4b4b5c579c74e54a557c2ad09bab1d4..17af0242c341b760270793b3505894fb8f397035
--- 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
@@@ -142,3 -143,4 +142,4 @@@ tests/var
  tmp_chroot
  unittests/unittests
  tests/libmemcached-1.0/testsocket
+ example/t/memcached_light