From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 16 May 2007 08:44:51 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2722^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6ed77468d573bd83de264aa29d18eab438eafb0;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 0c6dc471e33e80db00a2b006262c4107f39fa023)
---

d6ed77468d573bd83de264aa29d18eab438eafb0