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

Merge trunk
---

a9c18d99fb245723f9d742af72eff9efa50e0334