From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 5 May 2007 18:38:41 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2768^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f6d9c73d8c5fb32755cfd25840b7d458b28f0c6;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 08173e3ab77178b9841db0081a51b93291d9e8dc)
---

0f6d9c73d8c5fb32755cfd25840b7d458b28f0c6