From: Brian Aker <brian@tangent.org>
Date: Wed, 26 Oct 2011 15:47:56 +0000 (-0700)
Subject: Merge from tip
X-Git-Tag: 1.0.2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c77b9145bdd52be378fd3ba445d871a150144e2c;p=m6w6%2Flibmemcached

Merge from tip
---

c77b9145bdd52be378fd3ba445d871a150144e2c