Build Fix with History
Copying should be in
Resources where the make file
expect them, but CVS history has been rewritten (before conversion to
Git) to move them to the top level.
This merge commit attaches the corrected history as the first parent where programs that work with a linear history expect it, and the broken history as the second parent so that git history is not broken.
This may need special handling to apply, and can not be rebased.