From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 5 Jun 2007 08:16:45 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2559^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=317dec2f9e8ea67dcbc47e6187ffef809d58f644;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 5f1f889e0e124c5275463795c004ae971945e1ae)
---

317dec2f9e8ea67dcbc47e6187ffef809d58f644