From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 7 Aug 2007 00:47:30 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2444^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5a365347102d4e0b638932b4fe53a9235e55ca8;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit e81b5455af04a76ff53a0eceed9db7e4599c221e)
---

b5a365347102d4e0b638932b4fe53a9235e55ca8