From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 5 Jul 2007 00:01:35 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2469^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8df14ced22a37463bf82d525568cd91e040aaf0f;p=thirdparty%2Fsamba.git

merge from tridge

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

8df14ced22a37463bf82d525568cd91e040aaf0f