Big honkin' merge from head. Sheesh!

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

source/java/org/alfresco/web/bean/DocumentPropertiesBean.java

@@ -262,7 +262,7 @@ public class DocumentPropertiesBean
          String statusMsg = MessageFormat.format(
                Application.getMessage(
                      FacesContext.getCurrentInstance(), "error_exists"), 
-                     e.getExisting().getName());
+                     e.getName());
          Utils.addErrorMessage(statusMsg);
          // no outcome
          outcome = null;