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

merge from tridge

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

c6efeaad9123c3fec8939f206b894a3ca6a2595d