Merge the tree-conflicts branch back to trunk. This implements basic tree
tree265acfb6b8ddd2a07b18293f82d1e94829ae33c9
drwxr-xr-x - svntest