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

merge from tridge

(This used to be ctdb commit 1c33c9856c05068a5681f3e37c9b94f429038a69)
---

c7c5f2e9bc58f8bf0fc5dc288eb6cf7948051712