From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 4 Jul 2007 07:53:16 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2472^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=295fe500a80db0a16c1e253c0383045d6ab140f8;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 35d32876b41216cead039c9cd28ba9ace8cdcd61)
---

295fe500a80db0a16c1e253c0383045d6ab140f8