From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Mon, 4 Jun 2007 05:44:13 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2571^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=464ed12991fb858a40a2041292b5462fbc850c9a;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 948b449748a126386f49ef9e763cfffd8b651516)
---

464ed12991fb858a40a2041292b5462fbc850c9a