From: Brian Aker <brian@tangent.org>
Date: Sun, 8 Jan 2012 06:55:16 +0000 (-0800)
Subject: Merge with build trunk
X-Git-Tag: 1.0.3~1^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=81a0c9a7b94f27a20fab8fa60ec22e97b128ec94;p=m6w6%2Flibmemcached

Merge with build trunk
---

81a0c9a7b94f27a20fab8fa60ec22e97b128ec94