From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 13 Jun 2007 03:32:19 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2485^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0b0773a79fb06416df2d09c2dbad3b98e1f50c4;p=thirdparty%2Fsamba.git

merge from tridge

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

b0b0773a79fb06416df2d09c2dbad3b98e1f50c4