From: Trond Norbye <trond.norbye@sun.com>
Date: Sun, 14 Jun 2009 18:52:39 +0000 (+0200)
Subject: merge upstream
X-Git-Tag: 0.31~15^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=921abbe1906e77cc18cbe8859bc5afe9494d780e;p=m6w6%2Flibmemcached

merge upstream
---

921abbe1906e77cc18cbe8859bc5afe9494d780e