From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 6 Jun 2007 03:01:24 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2544^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b51487b8f05bc64a2666bf406d05e0e190f1c6b1;p=thirdparty%2Fsamba.git

merge from tridge

(This used to be ctdb commit 269bcf734b199ae15abd3bc09657030d178cff91)
---

b51487b8f05bc64a2666bf406d05e0e190f1c6b1