From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 6 Jun 2007 21:06:54 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2544^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2485d1ef030737a3c05d470c3631a31f1bdca13b;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 18d2052d3ba2215d696da88aa1e18c4a4c856914)
---

2485d1ef030737a3c05d470c3631a31f1bdca13b