From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 18 Jul 2007 21:29:53 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2445^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c0ffe7413a1277925e145e13d440ec0fd72fbbc;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 9ec696d6ab6a3657800b7ba6e29a2b2f7e48e187)
---

6c0ffe7413a1277925e145e13d440ec0fd72fbbc