merge from ronnie

diff --cc common/ctdb_client.c
Simple merge

diff --cc common/ctdb_daemon.c
Simple merge

diff --cc tests/ctdb_fetch1.c
Simple merge