Merge trond from lp:~trond-norbye/libmemcached/bug_396882
authorMonty Taylor <mordred@inaugust.com>
Wed, 8 Jul 2009 17:59:54 +0000 (10:59 -0700)
committerMonty Taylor <mordred@inaugust.com>
Wed, 8 Jul 2009 17:59:54 +0000 (10:59 -0700)

Trivial merge