Merge branch 'master' of ctdb into 'master' of samba