From: Brian Aker <brian@tangent.org>
Date: Sun, 29 Jan 2012 12:39:51 +0000 (-0800)
Subject: Merge in trunk
X-Git-Tag: 1.0.7~18^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f19d17ca4cd851c81c005b68c82b17c3c21b6846;p=m6w6%2Flibmemcached

Merge in trunk
---

f19d17ca4cd851c81c005b68c82b17c3c21b6846