From: Brian Aker <brian@tangent.org>
Date: Tue, 24 May 2011 21:47:22 +0000 (-0700)
Subject: Merge trunk.
X-Git-Tag: 0.51~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7bbdcadb9f09dcc09124e3b6d61d3699cf21176b;p=m6w6%2Flibmemcached

Merge trunk.
---

7bbdcadb9f09dcc09124e3b6d61d3699cf21176b