From: Brian Aker <brian@tangent.org>
Date: Mon, 28 Nov 2011 05:39:23 +0000 (-0800)
Subject: Merge in trunk
X-Git-Tag: 1.0.3~4^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3481bbb3f9e4f98c7b984b0f77ebeb468a7d486b;p=m6w6%2Flibmemcached

Merge in trunk
---

3481bbb3f9e4f98c7b984b0f77ebeb468a7d486b