From: Brian Aker <brian@tangent.org>
Date: Mon, 30 Jan 2012 09:47:54 +0000 (-0800)
Subject: Merge build trunk.
X-Git-Tag: 1.0.7~18^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=dd3626ef6e3fd2a4f7d88a23cd9a91fc2ab5e32d;p=m6w6%2Flibmemcached

Merge build trunk.
---

dd3626ef6e3fd2a4f7d88a23cd9a91fc2ab5e32d