From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 4 May 2007 07:05:28 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2780^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=508cafd17e1c926f4e55cb5fd0dfebaea50fed6b;p=thirdparty%2Fsamba.git

merge from tridge

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

508cafd17e1c926f4e55cb5fd0dfebaea50fed6b