From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 13 Jul 2007 01:30:19 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2450^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89d13add13a854f32f4be618a03205c116c2af4b;p=thirdparty%2Fsamba.git

merge from tridge

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

89d13add13a854f32f4be618a03205c116c2af4b