merged from ronnie

(This used to be ctdb commit 765b07fa5d1af07c8c7212d19d8e9574060b3039)

diff --cc ctdb/server/ctdb_takeover.c
Simple merge