incorporated into the master sources, so it is unnecessary to resolve all the conflicts that would occur if we let CVS "merge" the versions.
