From: Brian Aker <brian@tangent.org>
Date: Thu, 26 Jan 2012 07:13:53 +0000 (-0800)
Subject: Merge build trunk.
X-Git-Tag: 1.0.4^2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ef3cb20e2967fc17cf7f1c5b6eb14e84bc88a7dc;p=m6w6%2Flibmemcached

Merge build trunk.
---

ef3cb20e2967fc17cf7f1c5b6eb14e84bc88a7dc