From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sun, 8 Jul 2007 22:38:01 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2462^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55a4a5def3440d7cc5d793696b0454f03e4925e7;p=thirdparty%2Fsamba.git

merge from tridge

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

55a4a5def3440d7cc5d793696b0454f03e4925e7