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/repo/domain/DbPermission.java

@@ -51,4 +51,10 @@ public interface DbPermission extends Serializable
      * @param name the name of the permission
      */
     public void setName(String name);
+    
+    /**
+     * @return Returns a key combining the {@link #getTypeQname() type}
+     *      and {@link #getName() name}
+     */
+    public DbPermissionKey getKey();
 }