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

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

473ca4e3f7c35ccefc54852337778f5afe3949b3