From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 2 Jun 2007 22:32:29 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2588^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bab73533cec7126d3519106d8818c11c39c40ff3;p=thirdparty%2Fsamba.git

merge from tridge

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

bab73533cec7126d3519106d8818c11c39c40ff3