hg merge binary, resolving one conflict by choosing left (new 0.17 version)
[m6w6/libmemcached] / lib / hsieh_hash.c
2007-11-25  Brian AkerAdded MEMCACHED_HASH_HSIEH.