merged from peter
drwxr-xr-x - ctdb