From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 5 Apr 2007 03:19:06 +0000 (+1000)
Subject: merge from ronnies branch
X-Git-Tag: tevent-0.9.20~348^2~2962
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c4ce7f709d6ce2fb934bb24dad074b316a348a5;p=thirdparty%2Fsamba.git

merge from ronnies branch
(This used to be ctdb commit 713dc36e85c762fedcd8be3b4b25b7a4fb780f10)
---

9c4ce7f709d6ce2fb934bb24dad074b316a348a5