From: Brian Aker <brian@tangent.org>
Date: Sun, 28 Apr 2013 06:53:51 +0000 (-0400)
Subject: Merge tree from intel box.
X-Git-Tag: 1.0.18~25^2~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9d09bd78e83c7798b273e98df63bc9dd76c7b5a9;p=m6w6%2Flibmemcached

Merge tree from intel box.
---

9d09bd78e83c7798b273e98df63bc9dd76c7b5a9