merge from ronnie

(This used to be ctdb commit 867468a7aadc11d0cb4d9f0eab55d3f34f11d6d3)

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

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

diff --cc ctdb/tests/ctdb_fetch1.c
Simple merge