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

merge from tridge

(This used to be ctdb commit 60f929273bd18d4afbaf9b27becd7644fe606a14)
---

5bbcded322b9f01bfc04eeb2dd82e71447def887