From: Brian Aker <brian@tangent.org>
Date: Fri, 3 Jun 2011 02:18:21 +0000 (-0700)
Subject: Merge in trunk.
X-Git-Tag: 0.51~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=498bcd4bb9f82435b8fb1ce8632732cc4f118bdd;p=m6w6%2Flibmemcached

Merge in trunk.
---

498bcd4bb9f82435b8fb1ce8632732cc4f118bdd