We don't need both the property sheet and:
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>

Remove the property sheet since it's in a separate tree.
Merge branch 'master' of ../cvs/3rdp