From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 1 Dec 2006 10:16:32 +0000 (+1100)
Subject: merge from ab
X-Git-Tag: tevent-0.9.20~348^2~3004
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f139e6e91a42a809b4f5b82af0ca7dd20987cfe;p=thirdparty%2Fsamba.git

merge from ab
(This used to be ctdb commit 8b3f9c901ad4b1485eb4b514da8466a0b50ef726)
---

6f139e6e91a42a809b4f5b82af0ca7dd20987cfe