From: Brian Aker <brian@tangent.org>
Date: Tue, 14 Feb 2012 16:13:00 +0000 (-0800)
Subject: Merge in trunk
X-Git-Tag: 1.0.7~17^2~16
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7381d22f76e658496685bf3e9ea17c49203a04c5;p=m6w6%2Flibmemcached

Merge in trunk
---

7381d22f76e658496685bf3e9ea17c49203a04c5