From: Ronnie sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 18 Apr 2007 22:18:38 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2869^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=450ab4a1707cdc490e5e7e2963180bef01e1e65b;p=thirdparty%2Fsamba.git

merge from tridge

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

450ab4a1707cdc490e5e7e2963180bef01e1e65b