Merge Trond

diff --cc ChangeLog
index 70cddaff32d3d2a5611c2e5df5ff676b12492b87,70cddaff32d3d2a5611c2e5df5ff676b12492b87..a972319da5ac2e425337c349758243155a8cc3f1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,6 @@@
++  * Added support for memcached_set_memory_allocators().
++  * Fixed bug in configure.ac for have_htoll.
++
  0.30 Sun May 31 17:31:52 PDT 2009
    * Added memcachd_dump command (and framework for memdump tool).
    * Realigned all structures to remove padding (and line up important bits for 64bit caches.