From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 28 Apr 2007 08:52:22 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2819^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c43e71b0af993716a6be228f64cddc990b003059;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 6ca7caa90f4aa7fa2753f6ee9090d629cdb63871)
---

c43e71b0af993716a6be228f64cddc990b003059