From: Martin Schwenke <martin@meltin.net>
Date: Fri, 22 Jan 2010 06:05:11 +0000 (+1100)
Subject: Merge commit 'origin/master'
X-Git-Tag: tevent-0.9.20~348^2~1593
X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=b5254bf4ef74136115e8499500e5963fced2df3a

Merge commit 'origin/master'

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

b5254bf4ef74136115e8499500e5963fced2df3a