From: Brian Aker <brian@tangent.org>
Date: Fri, 7 Oct 2011 21:09:46 +0000 (-0700)
Subject: Merge
X-Git-Tag: 1.0.2~8^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4609e20fc72e7f71cd8d4733bb3094e98104def4;p=m6w6%2Flibmemcached

Merge
---

4609e20fc72e7f71cd8d4733bb3094e98104def4