From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 3 Jun 2007 11:30:45 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2580^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b531862555a16a9f8d10c1a15eb347236c9d7290;p=thirdparty%2Fsamba.git

merge from tridge

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

b531862555a16a9f8d10c1a15eb347236c9d7290