From: Alexander Bokovoy <ab@samba.org>
Date: Wed, 29 Nov 2006 09:37:24 +0000 (+0300)
Subject: Merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~3011^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8077af9f37503376998632ca400ecc4da9cbeccd;p=thirdparty%2Fsamba.git

Merge from tridge

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

8077af9f37503376998632ca400ecc4da9cbeccd