From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 19 Apr 2007 00:07:07 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2869^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1812d787ac4f8609b875b99cb86982001bbe013c;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 414952b2dd48de4a9edb532ba9c2cb6e22bb6d7f)
---

1812d787ac4f8609b875b99cb86982001bbe013c