From: Brian Aker <brian@tangent.org>
Date: Tue, 11 Oct 2011 20:05:37 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~6^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=151262e139e4988712a0670116223fb9ebf3e38f;p=m6w6%2Flibmemcached

Merge
---

151262e139e4988712a0670116223fb9ebf3e38f