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

merge from tridge

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

c6f2050e05c9ee5bf282233ff151c02cefb558d9