From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 17 Oct 2007 00:10:52 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2373^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=805ba22d65536c2b4bd06aa0493ce96ec264349d;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 87760a95ec0a9e3cb2c415c569235a1ff58318cb)
---

805ba22d65536c2b4bd06aa0493ce96ec264349d