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

merge from tridge

(This used to be ctdb commit e7c318394b51936c7afef9451b8e32c42fac9829)
---

d4dfaaf76fc16f5e6e057f93bf4360e70df3f4dc