merged tridge's branch

(This used to be ctdb commit 02ec7d6abb75a7c0a414efd4a50d44e6f1e5e407)

diff --cc ctdb/common/ctdb.c
Simple merge

diff --cc ctdb/common/ctdb_daemon.c
Simple merge

diff --cc ctdb/include/ctdb.h
Simple merge

diff --cc ctdb/include/ctdb_private.h
Simple merge