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

merge from tridge

(This used to be ctdb commit 1a06ac66445ae0c3f18f5f0ed4fde959d235d03d)
---

bf3745df28f064fa5646aa6b94bdb21486f3bfbe