From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 22 Apr 2007 10:55:49 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2845^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f70c7df1f0a4114cb892b1480a25497454b968c0;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 2644ee0e81e4f78d35528999b0a18f4253f99794)
---

f70c7df1f0a4114cb892b1480a25497454b968c0