merge from ronnie
drwxr-xr-x - ctdb