diff -r af20ebf91ca6 -r fcee787f22fe symbian4/os/devicesrv/package_definition_3.0.xml
--- a/symbian4/os/devicesrv/package_definition_3.0.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition_3.0.xml	Wed May 19 10:37:39 2010 +0100
@@ -286,13 +286,13 @@
     <unit bldFile="commonservices/platformenv/group"/>
    </component>
    <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
-    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+    <meta rel="config"> 
       <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
     </meta>
     <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
    </component>
    <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
-    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+    <meta rel="config"> 
       <defined condition="SYMBIAN_BAFL_SYSUTIL"/>
     </meta>
     <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
@@ -363,7 +363,7 @@
     <meta rel="config">
      <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
     <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
    </component>
@@ -377,7 +377,7 @@
     <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
    </component>
    <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-    <!-- Move exports to a self-contained component.
+    <!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
     <unit bldFile="resourcemgmt/group"/>
    </component>
@@ -414,7 +414,7 @@
     <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
    </component>
    <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
-    <meta rel="config"> <!-- how can this be mandatory if it can be configured out? -->
+    <meta rel="config"> 
       <defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
     </meta>
     <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>