From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 21 Sep 2007 05:45:48 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2389^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=870c9cc8a2aee2501fa514bd9f18e1eb278204e3;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 01c388f12ed554bda1a46b21cd18bf1b00f962c3)
---

870c9cc8a2aee2501fa514bd9f18e1eb278204e3