From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Dec 2006 23:35:27 +0000 (+1100)
Subject: merge from Peter
X-Git-Tag: tevent-0.9.20~348^2~2987
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e667345409e0ca2322a4f0dd8e4d358796b8b661;p=thirdparty%2Fsamba.git

merge from Peter
(This used to be ctdb commit 19bbfc7eeaccb795782647c743690cf5c131796d)
---

e667345409e0ca2322a4f0dd8e4d358796b8b661