From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 19 Jul 2007 05:07:27 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2445^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=865e68db2be199c5b230dfa536bafd3f34745298;p=thirdparty%2Fsamba.git

merge from tridge

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

865e68db2be199c5b230dfa536bafd3f34745298