Merge

diff --combined .bzrignore
index dbe3e8943e3ec736662fdf864b90187e76e5abcf,b226418bf6a1b4deca0e3c78f8b9f42a644855e6..b9bd9e5342a54626b6e98c3c4085599e83ce7366
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -70,6 -70,7 +70,6 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
  docs/text
  example/memcached_light
  libhashkit-1.0/configure.h
@@@ -85,11 -86,7 +85,7 @@@ libtest/unittes
  libtest/version.h
  libtest/wait
  libtool
- libtool.m4
- ltoptions.m4
- ltsugar.m4
- ltversion.m4
- lt~obsolete.m4
+ m4/libtool.m4
  m4/libtool.m4 
  m4/ltoptions.m4
  m4/ltsugar.m4