From: Brian Aker <brian@Intel-Mini-2.local>
Date: Wed, 30 Jun 2010 08:52:59 +0000 (-0700)
Subject: Merge.
X-Git-Tag: 0.41~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=adfe7cbc9924a6407e02609ea2b517e4b699d269;p=m6w6%2Flibmemcached

Merge.
---

adfe7cbc9924a6407e02609ea2b517e4b699d269