From: Peter Somogyi <psomogyi@gamax.hu>
Date: Thu, 25 Jan 2007 11:31:33 +0000 (+0100)
Subject: Merged tridge's branch.
X-Git-Tag: tevent-0.9.20~348^2~2975^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c11b2f642b0743086c3c0d7b34174baaeac769d5;p=thirdparty%2Fsamba.git

Merged tridge's branch.
Reverted ib join (will do later).

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

c11b2f642b0743086c3c0d7b34174baaeac769d5