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/dialog/IDialogBean.java

@@ -1,7 +1,10 @@
 package org.alfresco.web.bean.dialog;
 
+import java.util.List;
 import java.util.Map;
 
+import org.alfresco.web.config.DialogsConfigElement.DialogButtonConfig;
+
 /**
  * Interface that defines the contract for a dialog backing bean
  * 
@@ -30,6 +33,13 @@ public interface IDialogBean
     */
    public String finish();
    
+   /**
+    * Returns a list of additional buttons to display in the dialog.
+    * 
+    * @return List of button configurations, null if there are no buttons
+    */
+   public List<DialogButtonConfig> getAdditionalButtons();
+   
    /**
     * Returns the label to use for the cancel button
     *