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

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

799312060db3a6fce9b8575732b46dcf01f6cb46