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

merge from tridge

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

377898d52bae888a93c9a88ef55a9529ae23a943