Merged tridge's branch.
drwxr-xr-x - ctdb