From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 10 Oct 2007 00:49:55 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2381^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33a6aa3c3f3be850929ea94446f13e6fc3669bab;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 4690a205fe4325b03ab044bdb5fbc9aa3e94db6e)
---

33a6aa3c3f3be850929ea94446f13e6fc3669bab