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

merge from tridge

(This used to be ctdb commit 3457af559a5d54fd9eb787f18ff15d7c19271f60)
---

1bb55c1f77327f0a0c887850151336814e4be1cf