Merge in differences from the resolver's version.
[catacomb] / setup
1999-05-05 mdwInitial revision