From: Martin Schwenke <martin@meltin.net>
Date: Wed, 31 Mar 2010 06:52:42 +0000 (+1100)
Subject: Merge commit 'origin/master'
X-Git-Tag: tevent-0.9.20~348^2~1584
X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=ce1fe0774b8a0221537d3edae1b6981bf4691126;hp=--cc

Merge commit 'origin/master'

(This used to be ctdb commit 4fb662bba6d96d4c04dadd9f908c4184ef4e969a)
---

ce1fe0774b8a0221537d3edae1b6981bf4691126