From: Brian Aker <brian@tangent.org>
Date: Thu, 2 Jun 2011 18:55:14 +0000 (-0700)
Subject: Merge in trunk.
X-Git-Tag: 0.51~6^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b9abfad1cd433c8c188ca559ba3858798fe3d187;p=m6w6%2Flibmemcached

Merge in trunk.
---

b9abfad1cd433c8c188ca559ba3858798fe3d187