From: Brian Aker <brian@tangent.org>
Date: Sat, 18 Feb 2012 16:55:35 +0000 (-0800)
Subject: Merge up.
X-Git-Tag: 1.0.7~17^2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=73e62c470da9bb5f0b0e4a2ecf195c7259e33cf1;p=m6w6%2Flibmemcached

Merge up.
---

73e62c470da9bb5f0b0e4a2ecf195c7259e33cf1