From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Fri, 13 Apr 2007 11:10:20 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2926^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f7d98380b0cc5aa5c117670ffd37d1684d40800;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 9c4e5569b82d9c7894e3ac1d5f0783c4d770daf4)
---

9f7d98380b0cc5aa5c117670ffd37d1684d40800