From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 14 Sep 2007 02:18:34 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2403^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acf8edb0eb5686c47e4fda863f1012d0fd34dda3;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 340b4a0a31a50385430fea015b146c84d0b2bbb2)
---

acf8edb0eb5686c47e4fda863f1012d0fd34dda3