From: Brian Aker <brian@tangent.org>
Date: Sat, 3 Mar 2012 02:19:44 +0000 (-0800)
Subject: Merge with build trunk.
X-Git-Tag: 1.0.7~16^2~1^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e268471e4642c16281dc65b2f0ad9b897786c0b4;p=m6w6%2Flibmemcached

Merge with build trunk.
---

e268471e4642c16281dc65b2f0ad9b897786c0b4