From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Apr 2007 10:44:43 +0000 (+1000)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2927
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=303c464c498598dbbcd91e715aaa40b856ea93cf;p=thirdparty%2Fsamba.git

merge from ronnie
(This used to be ctdb commit 867468a7aadc11d0cb4d9f0eab55d3f34f11d6d3)
---

303c464c498598dbbcd91e715aaa40b856ea93cf