From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 17 Apr 2007 05:35:06 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2894^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a2579cea919b7570e2c166260a097540cf98d2c;p=thirdparty%2Fsamba.git

merge from tridge

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

6a2579cea919b7570e2c166260a097540cf98d2c