commit 39797a8cd7110594fe6d6cd1c51c7f4b77909c89
author David Green <david.green@tasktop.com> Fri Jan 13 12:03:52 2012 -0800
committer David Green <david.green@tasktop.com> Fri Jan 13 12:03:52 2012 -0800
tree cd3df0b7a9f99aaadcfa444a1ce241c068deeb59
parent 50fd76554cdaa0d5041254f7d664d2a768144fa5
parent c59facc0ec20d5051b822fe91ffbe71592aaa139

Merge branch 'master' of ssh://dgreen@git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.incubator.git

org.eclipse.mylyn.monitor.usage-feature/feature.xml

diff --git a/org.eclipse.mylyn.monitor.usage-feature/feature.xml b/org.eclipse.mylyn.monitor.usage-feature/feature.xml
index d51a735..410b2c9 100644
--- a/org.eclipse.mylyn.monitor.usage-feature/feature.xml
+++ b/org.eclipse.mylyn.monitor.usage-feature/feature.xml
@@ -29,11 +29,9 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.net" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.context.core" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.monitor.core" version="3.7.0" match="compatible"/>
       <import feature="org.eclipse.rcp" version="3.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn.commons" version="3.7.0" match="compatible"/>
+      <import feature="org.eclipse.mylyn.monitor" version="3.7.0" match="compatible"/>
    </requires>
 
    <plugin

org.eclipse.mylyn.web.tasks-feature/feature.xml

diff --git a/org.eclipse.mylyn.web.tasks-feature/feature.xml b/org.eclipse.mylyn.web.tasks-feature/feature.xml
index b7b30ed..68dbf67 100644
--- a/org.eclipse.mylyn.web.tasks-feature/feature.xml
+++ b/org.eclipse.mylyn.web.tasks-feature/feature.xml
@@ -30,9 +30,6 @@
 
    <requires>
       <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.net" version="3.7.0" match="compatible"/>
-      <import plugin="org.eclipse.mylyn.commons.ui" version="3.7.0" match="compatible"/>
    </requires>
 
    <plugin