Merge in old and new memslap.

diff --cc .bzrignore
index 6d1eabf5ea876b99d34ca43fe7096c728e97c2aa,06c56d6932753800ba5105272c51b4748ce41d0c..1fe320b9ad0517d2e267e4a210d81fd70b274667
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -20,6 -20,6 +20,7 @@@ Makefile.i
  TAGS
  aclocal.m4
  autom4te.cache
++clients/memaslap
  clients/memcapable
  clients/memcat
  clients/memcp