From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 19 Sep 2007 01:54:45 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2397^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=577fffdc5d9a09be848fab3ff3207b39fd71a2e2;p=thirdparty%2Fsamba.git

merge from tridge

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

577fffdc5d9a09be848fab3ff3207b39fd71a2e2