merged tridge's branch
drwxr-xr-x - ctdb