From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 12 Apr 2007 07:13:48 +0000 (+1000)
Subject: merge from tridges tree
X-Git-Tag: tevent-0.9.20~348^2~2930^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=109ff6ed435a8e29972617d5a6c666aa0b5d3b69;p=thirdparty%2Fsamba.git

merge from tridges tree

(This used to be ctdb commit 63669f4b965fd03503bdbfe389243750c376a289)
---

109ff6ed435a8e29972617d5a6c666aa0b5d3b69