From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 17 Jun 2007 17:10:50 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=669a6b13f9532af23ab2c5222ec52f3b8009eacb;p=thirdparty%2Fsamba.git

merge from ronnie
(This used to be ctdb commit 7bfc1be6dff5bd5acadfa8a3fd8f00a8ce87ca54)
---

669a6b13f9532af23ab2c5222ec52f3b8009eacb