catchup merge - removed my foundation model changes from merge and will re-apply later (merge conflicts not worth resolving due to model order changing).
<?xml version="1.0"?>
<project name="SF-JOB-REFS">
<path id="sf.spec.os.system.definition.files">
<fileset dir="${sf.project.location}/" casesensitive="false">
<include name="sysdefs/system_model_os.xml" />
</fileset>
</path>
<path id="sf.spec.s60.system.definition.files">
<!-- <fileset dir="${sf.project.location}\sysdefs\" includes="S60_*.xml"/> -->
<fileset dir="${sf.project.location}/" casesensitive="false">
<include name="sysdefs/system_model_s60.xml" />
</fileset>
</path>
</project>