Morning merge.

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

source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml

@@ -19,16 +19,6 @@
            <generator class="native" />
         </id>
 
-        <set name="entries"
-               inverse="true"
-               lazy="false" 
-               cascade="delete"
-               optimistic-lock="true"
-               fetch="join" >
-            <key column="acl_id" />
-            <one-to-many class="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"  />
-        </set>
-         
         <set name="entries"
                inverse="true"
                lazy="false"