From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 10 Jul 2007 07:45:04 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2452^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b68a5293a9c57dfc6fa4ab6ceb14190f7e2f32e;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 6aecb65883eb902375f85b70a1512db4339833eb)
---

2b68a5293a9c57dfc6fa4ab6ceb14190f7e2f32e