From: Brian Aker <brian@tangent.org>
Date: Wed, 4 Jan 2012 05:59:51 +0000 (-0800)
Subject: Merge from build trunk.
X-Git-Tag: 1.0.3~3^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=920b0f21e75bb5b145a7de7383f5ae8c4a2c358a;p=m6w6%2Flibmemcached

Merge from build trunk.
---

920b0f21e75bb5b145a7de7383f5ae8c4a2c358a