From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 21 Apr 2007 07:57:50 +0000 (+1000)
Subject: merge from tridges tree
X-Git-Tag: tevent-0.9.20~348^2~2845^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=540e862afc59fbe7ce0ea1f4b19b9897f790751c;p=thirdparty%2Fsamba.git

merge from tridges tree

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

540e862afc59fbe7ce0ea1f4b19b9897f790751c