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

merge from tridge

(This used to be ctdb commit 2321a2a31e43208f16d6af15ee55a489670de005)
---

3dad8e64137db0943fa3b1db1bdad35526d07748