From: Brian Aker <brian@tangent.org>
Date: Fri, 9 Jan 2009 21:00:18 +0000 (-0800)
Subject: Merge.
X-Git-Tag: 0.26~21
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d455dd963105dc3ccc120887215f66dec8f55377;hp=d455dd963105dc3ccc120887215f66dec8f55377;p=m6w6%2Flibmemcached

Merge.
---