hg merge binary, resolving one conflict by choosing left (new 0.17 version)
[m6w6/libmemcached] / lib / crc.c
2007-10-31  Brian AkerMore Hashing methods
2007-10-30  Brian AkerAdding support for CRC Hashing