From: Brian Aker <brian@gaz>
Date: Tue, 6 Oct 2009 15:26:28 +0000 (-0700)
Subject: Merge Trond.
X-Git-Tag: 0.34~15
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7ed5aa2c6673ab92559e52a29e83c0a44f3beebc;p=m6w6%2Flibmemcached

Merge Trond.
---

7ed5aa2c6673ab92559e52a29e83c0a44f3beebc