merge from ab
drwxr-xr-x - ctdb