From: Brian Aker <brian@tangent.org>
Date: Thu, 7 Jul 2011 02:40:01 +0000 (-0700)
Subject: Merge trunk for LP
X-Git-Tag: 0.51~1^2~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=m6w6%2Flibmemcached

Merge trunk for LP
---

9cd57ce737375540f6c3b5e2e3684160e5c4bfce