From: Brian Aker <brian@tangent.org>
Date: Tue, 19 Jul 2011 22:08:44 +0000 (-0700)
Subject: Merge in trunk
X-Git-Tag: 0.51~1^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ca4acb0672e11e89af59ce588ea9c441c20b4e7a;p=m6w6%2Flibmemcached

Merge in trunk
---

ca4acb0672e11e89af59ce588ea9c441c20b4e7a