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

merge from tridge

(This used to be ctdb commit 819cdf314900388fe36368a21e2c4895b78b9203)
---

4ffc63aa2b907cd861375326aafcecd99af9a5ec