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

merge from ronnie
(This used to be ctdb commit 3d3b2eac028dc7d54e7ef0987a5f4063c4dcbe5a)
---

996d97b14515a0c7d8e147cff6b05d67ab97eb43