merge upstream
authorTrond Norbye <trond.norbye@sun.com>
Sun, 14 Jun 2009 18:52:39 +0000 (20:52 +0200)
committerTrond Norbye <trond.norbye@sun.com>
Sun, 14 Jun 2009 18:52:39 +0000 (20:52 +0200)
commit921abbe1906e77cc18cbe8859bc5afe9494d780e
tree8624b66ea3b9691d46934d8bd036fd6fae5a2737
parent9124a34c62a7e7c99fa7280596cace7d0bcb131e
parent618811a49324bf07ee0d3d435bb3843d3d57fd02
merge upstream
libmemcached/memcached.c
libmemcached/memcached.h
tests/function.c