From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 11 May 2007 00:37:42 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2723^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7769a2d45e04967e8c52868f7d8eac2166e9ca4d;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 826058b547b8e836f0a7066e9479e481ad9c472e)
---

7769a2d45e04967e8c52868f7d8eac2166e9ca4d