From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 16 Apr 2007 02:50:48 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2908^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b1d652d401dfdb036a37be099c6e68fd2add191;p=thirdparty%2Fsamba.git

merge from tridge

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

7b1d652d401dfdb036a37be099c6e68fd2add191