From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 2 May 2007 21:21:29 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2793^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e546cf13462c2e41f6540b60c2de24143109abb;p=thirdparty%2Fsamba.git

merge from tridge

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

3e546cf13462c2e41f6540b60c2de24143109abb