From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Apr 2007 11:32:16 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2930
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fadb253e3e283d166a81eb54131310b2ec2c4fbe;p=thirdparty%2Fsamba.git

merge from ronnie
(This used to be ctdb commit 8a6d3a2766d878f15892bf070536fd121424c9f7)
---

fadb253e3e283d166a81eb54131310b2ec2c4fbe