From: Brian Aker <brian@tangent.org>
Date: Tue, 14 Feb 2012 08:20:01 +0000 (-0800)
Subject: merge build trunk
X-Git-Tag: 1.0.7~17^2~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=75d320430633c5458c2430d36665369e2389482a;p=m6w6%2Flibmemcached

merge build trunk
---

75d320430633c5458c2430d36665369e2389482a