From: Brian Aker <brian@tangent.org>
Date: Wed, 20 Jul 2011 07:15:18 +0000 (-0700)
Subject: Merge trunk
X-Git-Tag: 0.51^2~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8cd543979f1967ebcc03e72f542a9ea2b12a0474;p=m6w6%2Flibmemcached

Merge trunk
---

8cd543979f1967ebcc03e72f542a9ea2b12a0474