# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1282580369 -3600
# Node ID e7ba2a7c8bd19125ca003d63c70b0508582d67fd
# Parent  3c5fc673b20132f1aeb3ca86d0229b4cd0581841# Parent  1544b5984174f22a41a575bd4cb35688171d1d17
Merge assorted config changes

diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_emailwizard.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_emailwizard.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_hbtheme.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_hbtheme.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_messaging.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_messaging.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_mmsengine.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_mmsengine.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_s60videotelephony.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_s60videotelephony.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_voicemailbox.confml
Binary file foundation_system/sf_config/CI_external/customisation/CustomisationInterface/confml/CI_voicemailbox.confml has changed
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/customisation/CustomisationInterface/root.confml
--- a/foundation_system/sf_config/CI_external/customisation/CustomisationInterface/root.confml	Mon Aug 16 16:59:05 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration name="CustomisationInterface__root_confml" xmlns="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xi:include href="confml/CI_bteng.confml"/>
-	<xi:include href="confml/CIA_bteng.confml"/>
-	<xi:include href="confml/CI_javainstaller.confml"/>
-	<xi:include href="confml/CI_javasecurity.confml"/>
-	<xi:include href="confml/CI_startup.confml"/>
-	<xi:include href="confml/CIA_StartupSequence.confml"/>
-	<xi:include href="confml/CIA_ShutdownSequence.confml"/>
-	<xi:include href="confml/CI_clockapp.confml"/>
-	<xi:include href="confml/CI_numbergrouping.confml"/>
-	<xi:include href="confml/CI_pdpcontextmanager2.confml"/>
-	<xi:include href="confml/CI_commsdatcreator.confml"/>
-	<xi:include href="confml/CI_camerax.confml"/>	
-	<xi:include href="confml/CI_emailwizard.confml"/>
-	<xi:include href="confml/CI_suplsettings_productconfig.confml"/>		
-	<xi:include href="confml/CI_securityconfig.confml"/>
-	<xi:include href="confml/CI_videoplayerservicelist.confml"/>
-</configuration>
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/sf_config/CI_external/group/bld.inf
--- a/foundation_system/sf_config/CI_external/group/bld.inf	Mon Aug 16 16:59:05 2010 +0100
+++ b/foundation_system/sf_config/CI_external/group/bld.inf	Mon Aug 23 17:19:29 2010 +0100
@@ -23,7 +23,6 @@
 
 
 ../customisation/Common/root.confml /epoc32/rom/config/customisation/Common/root.confml
-../customisation/CustomisationInterface/root.confml /epoc32/rom/config/customisation/CustomisationInterface/root.confml
 ../customisation/CustomisationInterface/confml/CIA_bteng.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CIA_bteng.confml
 ../customisation/CustomisationInterface/confml/CIA_ShutdownSequence.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CIA_ShutdownSequence.confml
 ../customisation/CustomisationInterface/confml/CIA_StartupSequence.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CIA_StartupSequence.confml
@@ -32,23 +31,27 @@
 ../customisation/CustomisationInterface/confml/CI_clockapp.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_clockapp.confml
 ../customisation/CustomisationInterface/confml/CI_commsdatcreator.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_commsdatcreator.confml
 ../customisation/CustomisationInterface/confml/CI_devman.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_devman.confml
-../customisation/CustomisationInterface/confml/CI_emailwizard.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_emailwizard.confml
 ../customisation/CustomisationInterface/confml/CI_factorydmprofiles.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_factorydmprofiles.confml
 ../customisation/CustomisationInterface/confml/CI_fotadiskstorage.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_fotadiskstorage.confml
 ../customisation/CustomisationInterface/confml/CI_fotaserver.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_fotaserver.confml
+../customisation/CustomisationInterface/confml/CI_hbtheme.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_hbtheme.confml
 ../customisation/CustomisationInterface/confml/CI_iaupdate.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_iaupdate.confml
 ../customisation/CustomisationInterface/confml/CI_javainstaller.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_javainstaller.confml
 ../customisation/CustomisationInterface/confml/CI_javasecurity.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_javasecurity.confml
 ../customisation/CustomisationInterface/confml/CI_lock.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_lock.confml
+../customisation/CustomisationInterface/confml/CI_messaging.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_messaging.confml
+../customisation/CustomisationInterface/confml/CI_mmsengine.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_mmsengine.confml
 ../customisation/CustomisationInterface/confml/CI_numbergrouping.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_numbergrouping.confml
 ../customisation/CustomisationInterface/confml/CI_pdpcontextmanager2.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_pdpcontextmanager2.confml
 ../customisation/CustomisationInterface/confml/CI_s60provisioning.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_s60provisioning.confml
 ../customisation/CustomisationInterface/confml/ci_s60telephony.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/ci_s60telephony.confml
+../customisation/CustomisationInterface/confml/CI_s60videotelephony.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_s60videotelephony.confml
 ../customisation/CustomisationInterface/confml/CI_securityconfig.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_securityconfig.confml
 ../customisation/CustomisationInterface/confml/CI_startup.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_startup.confml
 ../customisation/CustomisationInterface/confml/CI_suplsettings_productconfig.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_suplsettings_productconfig.confml
 ../customisation/CustomisationInterface/confml/CI_telephonyservices.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_telephonyservices.confml
 ../customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_videoplayerservicelist.confml
+../customisation/CustomisationInterface/confml/CI_voicemailbox.confml /epoc32/rom/config/customisation/CustomisationInterface/confml/CI_voicemailbox.confml
 ../customisation/Views/Features/root.confml /epoc32/rom/config/customisation/Views/Features/root.confml
 
 
diff -r 1544b5984174 -r e7ba2a7c8bd1 foundation_system/system_model/system_definition.xml
--- a/foundation_system/system_model/system_definition.xml	Mon Aug 16 16:59:05 2010 +0100
+++ b/foundation_system/system_model/system_definition.xml	Mon Aug 23 17:19:29 2010 +0100
@@ -122,6 +122,8 @@
       <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
       <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
       <package id="osrndtools" level="services" tech-domain="to" href="../../../../os/osrndtools/package_definition.xml"/>
+      <package id="mmimaging" level="services" tech-domain="mm" href="../../../../os/mmimaging/package_definition.xml"/>
+      <package id="openmaxil" level="services" tech-domain="mm" href="../../../../os/openmaxil/package_definition.xml"/>
     </layer>
     <layer id="mw" name="Middleware" levels="generic specific">
       <package id="appsupport" level="generic" tech-domain="rt" href="../../../../mw/appsupport/package_definition.xml"/>