From: Brian Aker <brian@tangent.org>
Date: Tue, 29 Nov 2011 23:28:01 +0000 (-0800)
Subject: Merge up current work from trunk
X-Git-Tag: 1.0.3~4^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=07affbd49a702e4dd9db927d9f19ffe3e3854038;p=awesomized%2Flibmemcached

Merge up current work from trunk
---

07affbd49a702e4dd9db927d9f19ffe3e3854038