From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 9 Jun 2007 05:17:16 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2511^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e42543d7308c0383b60eff9ddb6e46a0f5c154a4;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 2b17adcde51b213442fb0eea15b9ce7c85abf74a)
---

e42543d7308c0383b60eff9ddb6e46a0f5c154a4