Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/action/ActionDefinition.java

@@ -16,6 +16,10 @@
  */
 package org.alfresco.service.cmr.action;
 
+import java.util.List;
+
+import org.alfresco.service.namespace.QName;
+
 
 
 /**
@@ -25,5 +29,10 @@ package org.alfresco.service.cmr.action;
  */
 public interface ActionDefinition extends ParameterizedItemDefinition
 {
-	
+    /**
+     * Gets a list of the types that this action item is applicable for
+     * 
+     * @return  list of types
+     */
+    public List<QName> getApplicableTypes();
 }