From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 25 Sep 2007 01:43:42 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2381^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ee842461537cf407f3ea602e1712b059204517e;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 5655fab1284dce8f4a09ad426d53f5151c88968b)
---

0ee842461537cf407f3ea602e1712b059204517e