# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1259935764 0
# Node ID 43b688b25e10ee5c07250fe629da86234346c1e4
# Parent  b57c5fc53578eaa416e2f008000ae2307b59e9e6# Parent  bef44defe587a53cd2553a84738011120b4a6db7
Merge tags.

diff -r bef44defe587 -r 43b688b25e10 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Dec 04 14:09:24 2009 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="webuis" name="Web UIs" levels="plugin app">
+    <collection id="browserui" name="Browser UI" level="app">
+      <component id="browser" filter="s60" name="Browser">
+        <unit bldFile="browserui/browser/group"/>
+      </component>
+      <component id="operatormenu" filter="s60" name="Browser Operator Menu">
+        <unit bldFile="browserui/operatormenu/group"/>
+      </component>
+      <component id="videoservices" filter="s60" name="Browser Video Services">
+        <unit bldFile="browserui/videoservices/group"/>
+      </component>
+    </collection>
+    <collection id="browserplugins" name="Browser Plugins" level="plugin">
+      <component id="browsersysteminfoplugin" filter="s60" name="Browser System Info Plugin" class="plugin">
+        <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>
+      </component>
+      <component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
+        <unit bldFile="browserplugins/browsergpsplugin/group"/>
+      </component>
+      <component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
+        <unit bldFile="browserplugins/browseraudiovideoplugin/group"/>
+      </component>
+      <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">
+		<!-- can the #ifdef in this be handled elsewhere? -->
+        <unit bldFile="browserplugins/group"/>
+      </component>
+    </collection>
+    <collection id="pushmtm" name="Push MTM" level="plugin">
+      <component id="pushmtm_help" filter="s60" name="Push MTM Help">
+        <unit bldFile="pushmtm/help/group"/>
+      </component>
+      <component id="plugins" filter="s60" name="Push MTM Plugins" class="plugin">
+        <unit bldFile="pushmtm/plugins/group"/>
+      </component>
+      <component id="pushmtm_build" filter="s60" name="Push MTM Build">
+		<!-- can this be distributed into the other components? -->
+        <unit bldFile="pushmtm/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>