From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Mon, 27 Aug 2007 08:04:17 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2434^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b3cb21065bccba18d9ee47ba64a4765fee8defd;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 7cb17a0752c683f9b244e6f61fa45a770593c68d)
---

6b3cb21065bccba18d9ee47ba64a4765fee8defd