From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 27 Apr 2007 09:01:27 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2832^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c85caced319db0d42e8f5bd3864b5b8f1a1fe791;p=thirdparty%2Fsamba.git

merge from tridge

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

c85caced319db0d42e8f5bd3864b5b8f1a1fe791