From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 16 Oct 2007 01:26:22 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2374^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e2e1b14fb3c70ca3bb9f9884061a8d5d79e1308;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 9e6bc12c9be2dabcfb9c6aeef257ef4737287fab)
---

7e2e1b14fb3c70ca3bb9f9884061a8d5d79e1308