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

merge from tridge

(This used to be ctdb commit 268a89db5886955e290538fdc08d3e94172e3527)
---

506fa488b977bc4cedc3669362e7f44cc42cbae1