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

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

a99a0470affcf3de46a20ad366e4b42298c1d430