From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Tue, 17 Apr 2007 23:28:40 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2884^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=818abe7085a81b07d143d64b72d15bcb58148cfc;p=thirdparty%2Fsamba.git

merge from tridge

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

818abe7085a81b07d143d64b72d15bcb58148cfc