From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 16 Apr 2007 23:37:13 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2908^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6fe6d592b31096e3334116e7c36aed1ea7eb921;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 1000ea33025b625e23e7065f95efad447c380c8c)
---

c6fe6d592b31096e3334116e7c36aed1ea7eb921