From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 5 Apr 2007 23:46:45 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2961
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16e7d716d12c68ed00d04fe3a296da9eae6446dd;p=thirdparty%2Fsamba.git

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

16e7d716d12c68ed00d04fe3a296da9eae6446dd