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

merge from tridge

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

294d7fc05f634441f8d2b359a4778cb5b6a81ea3