From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 17 Jun 2007 17:14:06 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2480^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58e9fab5b27188802c897abfc7ba45245fb474cb;p=thirdparty%2Fsamba.git

merge from tridge

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

58e9fab5b27188802c897abfc7ba45245fb474cb