From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 3 Jun 2007 08:41:29 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2583^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6d455c15404d8e4937501b0d1820a1c645b1385;p=thirdparty%2Fsamba.git

merge from tridge

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

a6d455c15404d8e4937501b0d1820a1c645b1385