From: Padraig O'Sullivan <osullivan.padraig@gmail.com>
Date: Tue, 4 Aug 2009 03:22:07 +0000 (-0400)
Subject: Merge from trunk.
X-Git-Tag: 0.34~13^2~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=31079a798f38d56476c644a7ec596a600fb01930;hp=2424a380bc89c1507a9c1d35952c318423c9a100;p=m6w6%2Flibmemcached

Merge from trunk.
---