From: Brian Aker <brian@tangent.org>
Date: Fri, 17 Feb 2012 23:51:31 +0000 (-0800)
Subject: Merge trunk
X-Git-Tag: 1.0.7~17^2~10
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bebce1c7e0b2be0d276aa7ccfa30122083356b79;p=m6w6%2Flibmemcached

Merge trunk
---

bebce1c7e0b2be0d276aa7ccfa30122083356b79