From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Mon, 24 Sep 2007 00:27:48 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2389^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa90c8e26e31e16e014143299107c65364139596;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 7f9242747543ea1a2cc05f5c8afc51ab26e7d4bb)
---

fa90c8e26e31e16e014143299107c65364139596