From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 6 May 2007 22:07:26 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2766^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54d2acec40653cc6f1b0cdce9544d89cd6a1a618;p=thirdparty%2Fsamba.git

merge from tridge

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

54d2acec40653cc6f1b0cdce9544d89cd6a1a618