From: Brian Aker <brian@tangent.org>
Date: Sat, 14 Jul 2012 19:26:42 +0000 (-0700)
Subject: Merge from built to trunk
X-Git-Tag: 1.0.10~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=85b7bde8fee1a43ace784690188e2f4c62f89825;p=m6w6%2Flibmemcached

Merge from built to trunk
---

85b7bde8fee1a43ace784690188e2f4c62f89825