From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 27 Apr 2007 12:45:45 +0000 (+0200)
Subject: merge from ronnie
X-Git-Tag: tevent-0.9.20~348^2~2832
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b8bb39b8aba421ddfea0240cbf458fbe8d37342;p=thirdparty%2Fsamba.git

merge from ronnie
(This used to be ctdb commit c2ad6820f4526c230178e7d1b66b82103bfed904)
---

5b8bb39b8aba421ddfea0240cbf458fbe8d37342