From: Brian Aker <brian@tangent.org>
Date: Sun, 13 Jan 2013 11:46:07 +0000 (-0500)
Subject: Merge in build trunk.
X-Git-Tag: 1.0.16~10^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=baa7ee012f8399dc3e19860224179f4111e7efbf;p=m6w6%2Flibmemcached

Merge in build trunk.
---

baa7ee012f8399dc3e19860224179f4111e7efbf