Gentools is proving a trouble spot for merging C++ independently of Java. It's not obvious how best to merge the 0-9 changes to gentool to the trunk without breaking the 0-8 Java implementation that's sitting there. Anyone have any suggestions? I'll get back to it tomorrow. Cheers, Alan.