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

merge from tridge

(This used to be ctdb commit 5724d41352df252151e54ecdb02baa7f82c3aabf)
---

da545cea84bb41d1f643501d98e06b0faf9a26bb