From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 21 Sep 2007 03:20:29 +0000 (+1000)
Subject: merge from tridge
X-Git-Tag: tevent-0.9.20~348^2~2397^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9f45419da53de4eb0ba9386c7a4b4a896f00b9b;p=thirdparty%2Fsamba.git

merge from tridge

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

e9f45419da53de4eb0ba9386c7a4b4a896f00b9b