From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 8 Aug 2007 00:14:44 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2442^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c522b852c49c1dd4e77616b665042cd954aa2a46;p=thirdparty%2Fsamba.git

merge from tridge

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

c522b852c49c1dd4e77616b665042cd954aa2a46