From: Brian Aker <brian@tangent.org>
Date: Sun, 11 Mar 2012 02:56:32 +0000 (-0800)
Subject: Merge in build trunk.
X-Git-Tag: 1.0.7~16^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c6581942a9f3089c1d14e2cbc749d47a93247e78;hp=-c;p=m6w6%2Flibmemcached

Merge in build trunk.
---

c6581942a9f3089c1d14e2cbc749d47a93247e78