From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 3 May 2007 04:42:53 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2787^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7cd7e4cdebfe23ba4dec1598f918f9c6a1b59ca;p=thirdparty%2Fsamba.git

merge from tridge

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

e7cd7e4cdebfe23ba4dec1598f918f9c6a1b59ca