From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Mon, 2 Jul 2007 08:41:37 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2478^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fd39224ec34495376ad0e16c53734ae548f5bc8;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 34f489c145ba5b717713c826df0f6cf98ec54eae)
---

1fd39224ec34495376ad0e16c53734ae548f5bc8