From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 9 May 2007 23:44:28 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2759^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=325f321409f3b6d151b98b33c3404f474980f56c;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 8c5e6836280499243c0cd247093844a891f00da3)
---

325f321409f3b6d151b98b33c3404f474980f56c