merged tridge's code
tree0b23383e0aafc2c8a4fb246d3543479744855562
drwxr-xr-x - ctdb