From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 17 Apr 2007 05:02:20 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2894^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67a9f54dabeeb0ec5d8de54e3c7c290cfe392901;p=thirdparty%2Fsamba.git

merge from tridge

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

67a9f54dabeeb0ec5d8de54e3c7c290cfe392901