From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 May 2007 21:19:29 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2794
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=622dbb63374ec708d89a9511fb55d2ca5e5aba19;p=thirdparty%2Fsamba.git

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

622dbb63374ec708d89a9511fb55d2ca5e5aba19