From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 11 Apr 2007 21:49:28 +0000 (+1000)
Subject: merge from ridge and vl
X-Git-Tag: tevent-0.9.20~348^2~2933^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4544f6bfea728287525aad6bf525ac328631a3f;p=thirdparty%2Fsamba.git

merge from ridge and vl

(This used to be ctdb commit 8d407c5858a20c9757024f19033b5ef174ec3681)
---

e4544f6bfea728287525aad6bf525ac328631a3f