Some minor changes before integrating ib...
tree2646bf8e1c07ad2ff7a22f3e50941a330f99ddfc
drwxr-xr-x - ctdb