From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 18 Apr 2007 07:03:10 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2878^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fbf2b9a1c19aa8ff4e644e982270f74915c12a4;p=thirdparty%2Fsamba.git

merge from tridge

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

4fbf2b9a1c19aa8ff4e644e982270f74915c12a4