From: Brian Aker <brian@tangent.org>
Date: Sat, 11 Feb 2012 23:24:54 +0000 (-0800)
Subject: Merge from trunk
X-Git-Tag: 1.0.7~17^2~24
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=17f39686652b6dfe6f0d3782bdf3b581b093190b;p=m6w6%2Flibmemcached

Merge from trunk
---

17f39686652b6dfe6f0d3782bdf3b581b093190b