From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 21 Sep 2007 04:47:32 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2397
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4dd92de8272d8d596b34ab254c00cbcc5899181;p=thirdparty%2Fsamba.git

merge from ronnie
(This used to be ctdb commit 485182ba7b91b756f93be4863bf5fa208d460a54)
---

f4dd92de8272d8d596b34ab254c00cbcc5899181