Merge in touch/etc

diff --cc .bzrignore
index 8432fe194ba45d4a528bb6aad1961ede81733500,dedeb4cbd6e90bc7fb3988d0fdd555ae28198dcf..dbe3e8943e3ec736662fdf864b90187e76e5abcf
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -70,11 -70,12 +70,11 @@@ docs/doctest
  docs/doctrees/
  docs/html/
  docs/linkcheck/
 -docs/man/*
  docs/text
  example/memcached_light
- libhashkit/configure.h
+ libhashkit-1.0/configure.h
  libmemcached-?.??/
- libmemcached/configure.h
+ libmemcached-1.0/configure.h
  libmemcached/dtrace_probes.h
  libmemcached/generated_probes.h
  libmemcached/memcached_configure.h

diff --cc ChangeLog
Simple merge