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

merge from tridge

(This used to be ctdb commit 02cda01c032804cb1c53593ceb98685c827e2d58)
---

de6c5ed14d3885952f94c9c9e3e2b15e3e7c298f