From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 18 Oct 2007 05:53:50 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2370^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06cdb1ff3113ec69eecf3340c8539bc1e85fe279;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit ad03e63906270c9c076ffdb1f62f912bb414ea10)
---

06cdb1ff3113ec69eecf3340c8539bc1e85fe279