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

merge from tridge

(This used to be ctdb commit 5e2a9333363d76378d27f93231f217999a0c30e5)
---

4495dbacecf7363bf79f8bac525c3e5431f16643