From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 27 Aug 2007 08:04:53 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2435
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c94d4dc87fefc51946667a785ba13202e84541b;p=thirdparty%2Fsamba.git

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

8c94d4dc87fefc51946667a785ba13202e84541b