From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 22 Apr 2007 07:03:36 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2845^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=348e953f4b4b149f7cc6ec7d10d851dcd2b4642f;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 831847ba999e504b9c75f4e7c9c09c26bbeffcba)
---

348e953f4b4b149f7cc6ec7d10d851dcd2b4642f