From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 16 Sep 2007 21:43:15 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2397^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16ebb73a1b49acba2a0b604c245e7af5c34c03b1;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 6aa62f1b42c151e9a5760d927be484ce8a8540b0)
---

16ebb73a1b49acba2a0b604c245e7af5c34c03b1