From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 16 Apr 2007 04:45:09 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2908^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee170aa1febe55218f3bb9dc7f9dafbd52ec8c89;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 014a255f5e8d97d296d2fe061ab9c2c25494076d)
---

ee170aa1febe55218f3bb9dc7f9dafbd52ec8c89