From: Brian Aker <brian@tangent.org>
Date: Mon, 10 Oct 2011 07:28:13 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~7^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a3955c41d229334d020bf889cc031aa9fc3e00ca;p=m6w6%2Flibmemcached

Merge
---

a3955c41d229334d020bf889cc031aa9fc3e00ca