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

merge from tridge

(This used to be ctdb commit 39b7b8d42632a1cc78178f547d018178f3fe8313)
---

12d454eb7fe9ab2da78bb05b96ac80d379557360