From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 14 Apr 2007 21:41:35 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2926^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=986d99a0ffb5655ce5acd1689f345b017bf49df8;p=thirdparty%2Fsamba.git

merge from tridge

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

986d99a0ffb5655ce5acd1689f345b017bf49df8