--- a/symbian3/mw/appsupport/package_definition.xml	Tue Feb 16 12:48:05 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Tue Feb 16 18:06:19 2010 +0000
@@ -78,11 +78,16 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
         <collection name="contextframework" long-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 name="cfw" filter="s60" long-name="Context Framework">
-            <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
+            <!--<unit bldFile="contextframework/cfw/group"/> -->
           </component>
           <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
+            <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+          </component>
+          <component name="contextframework_build" filter="s60" long-name="Context Framework Build">
+            <unit bldFile="/sf/mw/appsupport/contextframework/group"/>
           </component>
         </collection>
         <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">