Fix for compilation on the Sun
merging new_design branch into OOPSE-2.0
change the #include in source files
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.