Integrate revision 5543

Fix from Paul (phib)
[ 2005701 ] Merge orgs fails -- duplicate role org access
http://sourceforge.net/tracker/index.php?func=detail&aid=2005701&group_id=176962&atid=879332

client/src/org/compiere/apps/form/VMerge.java

@@ -57,7 +57,7 @@ public class VMerge extends CPanel
 
 	/** Tables to delete (not update) for AD_Org	*/
 	static private String[]	s_delete_Org = new String[]
-		{"AD_OrgInfo"};
+		{"AD_OrgInfo", "AD_Role_OrgAccess"};
 	/** Tables to delete (not update) for AD_User	*/
 	static private String[]	s_delete_User = new String[]
 		{"AD_User_Roles"};