From: Brian Aker <brian@tangent.org>
Date: Thu, 21 Jul 2011 05:26:52 +0000 (-0700)
Subject: Merge trunk.
X-Git-Tag: 0.51^2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8368c501914b1a6fcd722395d07879bad65c540d;p=m6w6%2Flibmemcached

Merge trunk.
---

8368c501914b1a6fcd722395d07879bad65c540d