From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jul 2007 04:51:33 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2477
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59a16765c5ee31b0b71e1f5e372b0b8cb66dff95;p=thirdparty%2Fsamba.git

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

59a16765c5ee31b0b71e1f5e372b0b8cb66dff95