From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 9 May 2007 20:55:28 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2759^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbb6f99f416a2a723d213143584ac1a80e7109c7;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 190cca8488dff982062ae7b1a82cb33cc1cdfaf7)
---

cbb6f99f416a2a723d213143584ac1a80e7109c7