From: Brian Aker <brian@tangent.org>
Date: Fri, 8 Jul 2011 01:04:46 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: 0.51~1^2~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3bebb0839f95592b26678370969c474a88099c4c;p=m6w6%2Flibmemcached

Merge from trunk.
---

3bebb0839f95592b26678370969c474a88099c4c