From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 5 May 2007 01:46:44 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2770^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86b78a5d04cd926396f824483fea9c32f9cc5ce5;p=thirdparty%2Fsamba.git

merge from tridge

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

86b78a5d04cd926396f824483fea9c32f9cc5ce5