From: Brian Aker <brian@tangent.org>
Date: Fri, 6 Jan 2012 02:38:24 +0000 (-0800)
Subject: Merge trunk.
X-Git-Tag: 1.0.3~2^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=af10b13c0bef5dfd103961632b2a6a77b79b8e0b;p=m6w6%2Flibmemcached

Merge trunk.
---

af10b13c0bef5dfd103961632b2a6a77b79b8e0b