From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 11 Apr 2007 05:40:03 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2937^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7a1de7bf204c29e6d8b4ef1dd13fb375713a6b9;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 257a167d7e8b532c03a122626dbc2db767dbfdf0)
---

a7a1de7bf204c29e6d8b4ef1dd13fb375713a6b9