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

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

18af44e37d01e428b72900797011495e71e6998d