From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 6 Sep 2007 23:21:40 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2430^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68c37f9b4156e0c2ff1c4ad68e79677ddf58d57b;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 58c918b1bfe09c31049769dee266129cbad4cb20)
---

68c37f9b4156e0c2ff1c4ad68e79677ddf58d57b