Log Message: This file was removed on rev 1.14. I don't know why cvs re-added it instead of aborting because of the conflict.