From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 22 Aug 2007 09:28:03 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2435^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ede6da6f4a6e28152498c1455576a94a6c4cc8;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 3e17a62e7d9f2867d6f697d5dc5cdddf9fdc3497)
---

a4ede6da6f4a6e28152498c1455576a94a6c4cc8