From: Brian Aker <brian@tangent.org>
Date: Sat, 17 Sep 2011 19:45:35 +0000 (-0700)
Subject: Merge in trunk.
X-Git-Tag: 1.0.2~19
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=77e79fb2056c9a177a670da48178fd1ac051d33d;p=m6w6%2Flibmemcached

Merge in trunk.
---

77e79fb2056c9a177a670da48178fd1ac051d33d