--- a/symbian4/mw/appsupport/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -140,22 +140,17 @@
    </component>
   </collection>
   <collection id="contextframework" name="Context Framework" level="framework">
-   <!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
    <component id="cfw" filter="s60" name="Context Framework">
     <meta rel="config">
      <defined condition="RD_CONTEXT_FRAMEWORK"/>
     </meta>
-    <!--<unit bldFile="contextframework/cfw/group"/> -->
+    <unit bldFile="contextframework/cfw/group"/>
    </component>
    <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
     <meta rel="config">
      <defined condition="RD_CONTEXT_FRAMEWORK"/>
     </meta>
-    <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-   </component>
-   <component id="contextframework_build" filter="s60" name="Context Framework Build">
-    <unit bldFile="contextframework/group"/>
+    <unit bldFile="contextframework/cfwplugins/group"/>
    </component>
   </collection>
   <collection id="coreapplicationuis" name="Core Application UIs" level="server">