svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

matthew_swift

05.04.2009 67405dde9ba213331dab1fc46cb18c485070fd5b

 opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.upgrader.ui;
@@ -114,9 +114,12 @@
     * We can use org.opends.server.util.DynamicConstants without problems as it
     * has been added to quicksetup.jar during build time.
     */
    return INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
                    DynamicConstants.COMPACT_VERSION_STRING,
                    DynamicConstants.BUILD_ID);
    return Utils.getCustomizedObject(
        "INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS",
        INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
            DynamicConstants.COMPACT_VERSION_STRING,
            DynamicConstants.BUILD_ID),
        Message.class);
  }

  /**