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

merge from tridge

(This used to be ctdb commit 1385198344abb55c811edb955fbbc06bf72a1fb5)
---

5b7a0734a852a156071df062148b76274852e29c