Merge.
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="iptelephony" name="IP Telephony" levels="eng plugin util ui">
<collection id="iptelcommsconfig" name="IP Telephony Comms Config" level="ui">
<component id="cscgsplugin" filter="s60" name="CSC GS Plugin" class="plugin" introduced="^2">
<unit bldFile="commsconfig/cscgsplugin/group"/>
</component>
<component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
<unit bldFile="commsconfig/cscsipvoipcleanupplugin/group"/>
</component>
<component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
<unit bldFile="commsconfig/cscengine/group"/>
</component>
<component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
<unit bldFile="commsconfig/cscsettingsui/group"/>
</component>
<component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
<unit bldFile="commsconfig/cscapplicationui/group"/>
</component>
<component id="commsconfig_build" filter="s60" name="Comms Config Build" introduced="^2">
<!-- consider distributing this into the above components -->
<unit bldFile="commsconfig/group"/>
</component>
</collection>
<collection id="convergedconnectionhandler" name="Converged Connection Handler" level="eng">
<component id="cchserver" filter="s60" name="CCH Server" introduced="^2">
<unit bldFile="convergedconnectionhandler/cchserver/group"/>
</component>
<component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
<unit bldFile="convergedconnectionhandler/cchclient/group"/>
</component>
<component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
<unit bldFile="convergedconnectionhandler/cchclientapi/group"/>
</component>
<component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
<!-- consider distributing this into the above components, or collapse the collection into a single component -->
<unit bldFile="convergedconnectionhandler/group"/>
</component>
</collection>
<collection id="richcallsettingsengine" name="Rich Call Settings Engine" level="eng">
<component id="rcse2" filter="s60" name="Rich Call Settings Engine Build" introduced="^2">
<unit bldFile="richcallsettingsengine/rcse2/group"/>
</component>
</collection>
<collection id="sipvoipprovider" name="SIP VoIP Provider" level="plugin">
<component id="svp" filter="s60" name="SIP VoIP Provider Build" class="plugin" introduced="^2">
<unit bldFile="sipvoipprovider/group"/>
</component>
</collection>
<collection id="voipplugins" name="VoIP Plugins" level="plugin">
<component id="sipmxresolver" filter="s60" name="SIP MX Resolver" class="plugin" introduced="^2">
<unit bldFile="voipplugins/sipmxresolver/group"/>
</component>
<component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
<unit bldFile="voipplugins/sipconnectionprovider/group"/>
<!-- can only have one unit, can the next be #'included from the above? -->
<unit bldFile="voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
</component>
<component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
<unit bldFile="voipplugins/ipapputils/group"/>
</component>
<component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
<unit bldFile="voipplugins/voipadapters/group"/>
</component>
<component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
<unit bldFile="voipplugins/accountcreationplugin/group"/>
</component>
<component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
<unit bldFile="voipplugins/dhcppositionprovider/group"/>
</component>
<component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
<unit bldFile="voipplugins/svtmatching/group"/>
</component>
<component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
<unit bldFile="voipplugins/svtlogging/group"/>
</component>
<component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
<unit bldFile="voipplugins/svtcallmenu/group"/>
</component>
</collection>
<collection id="callcontinuity" name="Call Continuity" level="util">
<component id="vccutils" filter="s60" name="VCC Utils" introduced="^2">
<unit bldFile="callcontinuity/vccutils/group"/>
</component>
<component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
<unit bldFile="callcontinuity/nsmldmvccadapter/group"/>
</component>
<component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
<unit bldFile="callcontinuity/vccclientprovisioningadapter/group"/>
</component>
<component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
<unit bldFile="callcontinuity/vccpropertyhandler/group"/>
</component>
<component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
<unit bldFile="callcontinuity/vcchotrigger/group"/>
</component>
<component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
<unit bldFile="callcontinuity/vcc/group"/>
</component>
<component id="settingsreader" filter="s60" name="Settings Reader" purpose="development" introduced="^2">
<!-- what to do with this component? -->
<!-- <unit bldFile="callcontinuity/settingsreader/group"/> -->
</component>
<component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
<!-- consider distributing this into the above components -->
<unit bldFile="callcontinuity/group"/>
</component>
</collection>
<collection id="iptelephony_info" name="IP Telephony Info" level="ui">
<component id="iptel_plat" filter="s60" class="api" name="IP Telephony Platform Interfaces" introduced="^2">
<unit bldFile="iptel_plat/group"/>
</component>
</collection>
</package>
</SystemDefinition>