From: Brian Aker <brian@tangent.org>
Date: Wed, 17 Aug 2011 21:05:28 +0000 (-0700)
Subject: Merge trunk.
X-Git-Tag: 1.0.2~22^2~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=645f3f1271ac967d9f98475f685e8820f9fe1ca6;p=m6w6%2Flibmemcached

Merge trunk.
---

645f3f1271ac967d9f98475f685e8820f9fe1ca6