From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 19 Apr 2007 02:00:29 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2869^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f0c8b566cdc7b4dbf548f3eea799ae604395464;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 45081eadb89fdaf8c831e161ae7df816beda934b)
---

9f0c8b566cdc7b4dbf548f3eea799ae604395464