diff -r 5f2b1b034911 nbbuild/templates/projectized.xml
--- a/nbbuild/templates/projectized.xml	Thu Nov 17 00:24:29 2011 +0100
+++ b/nbbuild/templates/projectized.xml	Thu Dec 01 17:17:33 2011 +0100
@@ -231,11 +231,6 @@
         <releasefilescopy cluster="${cluster}"/>
     </target>
 
-    <target name="-init-startlevel">
-        <property name="module.startlevel" value="4"/>
-        <property name="check.module.startlevel" value="false"/>
-    </target>
-
     <target name="-check-for-libs.junit4">
         <condition property="build.libs.junit4">
             <not>
@@ -260,6 +255,7 @@
             <sequential>
                 <property name="test.@{test.type}.folder" location="${build.dir}/test/@{test.type}/dist"/>
                 <property name="test.@{test.type}.out.folder" location="${test.@{test.type}.folder}"/>
+                <property name="test-@{test.type}-sys-prop.branding.token" value="nb"/>
             </sequential>
         </macrodef>
         <test-init-nborg test.type="unit"/>
diff -r 5f2b1b034911 nbjunit/arch.xml
--- a/nbjunit/arch.xml	Thu Nov 17 00:24:29 2011 +0100
+++ b/nbjunit/arch.xml	Thu Dec 01 17:17:33 2011 +0100
@@ -561,7 +561,7 @@
   <ul>
 
       <li>
-        <api name="nbjunit.diff.impl.CmdLine" group="property" type="export" category="devel">
+        <api name="nbjunit.diff.impl.CmdLine" group="systemproperty" type="export" category="devel">
             used only when nbjunit.diff.impl is set
             to org.netbeans.junit.diff.NativeDiff class. This property
             contain command line, which is called from NativeDiff class
@@ -573,14 +573,14 @@
       </li>
 
       <li>
-          <api name="nbjunit.workdir" group="property" type="export" category="devel">
+          <api name="nbjunit.workdir" group="systemproperty" type="export" category="devel">
             path to a directory, which is used as a root for tests' working
             directories (for details see JavaDoc for NbTestCase.getWorkDir()).
           </api>
       </li>
       
       <li>
-          <api name="NbTestCase.order" group="property" type="export" category="friend">
+          <api name="NbTestCase.order" group="systemproperty" type="export" category="friend">
             This property tries to influence the order of <code>NbTestCase</code>
             methods so it is more predicatable (see <a href="http://wiki.apidesign.org/wiki/OrderOfElements">
             Order of elements</a> for description of the problem). The acceptable
@@ -603,6 +603,15 @@
             randomness caused by JDK7</a>.
           </api>
       </li>
+      <li>
+          <api name="branding.token" group="systemproperty" type="export" category="devel">
+              <a href="@TOP@/org/netbeans/junit/NbModuleSuite.html">NbModuleSuite</a>
+              can now be influenced by system property <code>branding.token</code>.
+              If it is provided (by Ant harness for example), it is used
+              to call <a href="@org-openide-util@/org/openide/util/NbBundle.html#setBranding(java.lang.String)">
+              NbBundle.setBranding</a>.
+          </api>
+      </li>
   </ul>
  
 
diff -r 5f2b1b034911 nbjunit/src/org/netbeans/junit/NbModuleSuite.java
--- a/nbjunit/src/org/netbeans/junit/NbModuleSuite.java	Thu Nov 17 00:24:29 2011 +0100
+++ b/nbjunit/src/org/netbeans/junit/NbModuleSuite.java	Thu Dec 01 17:17:33 2011 +0100
@@ -43,6 +43,7 @@
 package org.netbeans.junit;
 
 import java.io.*;
+import java.lang.reflect.InvocationTargetException;
 import org.netbeans.junit.internal.NbModuleLogHandler;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -800,6 +801,7 @@
                 }
             }
             
+            
             // loader that does not see our current classloader
             JUnitLoader junit = new JUnitLoader(config.parentClassLoader, NbModuleSuite.class.getClassLoader());
             URLClassLoader loader = new URLClassLoader(bootCP.toArray(new URL[0]), junit);
@@ -815,6 +817,20 @@
             System.setProperty("netbeans.home", platform.getPath());
             System.setProperty("netbeans.full.hack", "true");
 
+            String branding = System.getProperty("branding.token"); // NOI18N
+            if (branding != null) {
+                try {
+                    Method setBranding = loader.loadClass("org.openide.util.NbBundle").getMethod("setBranding", String.class); // NOI18N
+                    setBranding.invoke(null, branding);
+                } catch (Throwable ex) {
+                    if (ex instanceof InvocationTargetException) {
+                        ex = ((InvocationTargetException)ex).getTargetException();
+                    }
+                    LOG.log(Level.WARNING, "Cannot set branding to {0}", branding); // NOI18N
+                    LOG.log(Level.INFO, "Cannot set branding because of following exception", ex); // NOI18N
+                }
+            }
+            
             File ud = new File(new File(Manager.getWorkDirPath()), "userdir" + invocations++);
             if (config.reuseUserDir) {
                 ud = lastUserDir != null ? lastUserDir : ud;
diff -r 5f2b1b034911 nbjunit/test/unit/src/test/pkg/not/in/junit/BrandingAssignedTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nbjunit/test/unit/src/test/pkg/not/in/junit/BrandingAssignedTest.java	Thu Dec 01 17:17:33 2011 +0100
@@ -0,0 +1,72 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package test.pkg.not.in.junit;
+
+import java.util.logging.Level;
+import junit.framework.Test;
+import org.netbeans.junit.NbModuleSuite;
+import org.netbeans.junit.NbTestCase;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class BrandingAssignedTest extends NbTestCase {
+    
+    public BrandingAssignedTest(String testName) {
+        super(testName);
+    }
+    
+    public static Test suite() {
+        return NbModuleSuite.createConfiguration(BrandingAssignedTest.class)
+            .clusters(".*").failOnException(Level.WARNING).suite();
+    }
+
+    public void testBrandingIsAssigned() throws Exception {
+        Object branding = NbBundle.getBranding();
+        assertEquals("Default branding in NetBeans is nb", "nb", branding);
+    }
+}
diff -r 5f2b1b034911 o.eclipse.equinox.common/nbproject/project.properties
--- a/o.eclipse.equinox.common/nbproject/project.properties	Thu Nov 17 00:24:29 2011 +0100
+++ b/o.eclipse.equinox.common/nbproject/project.properties	Thu Dec 01 17:17:33 2011 +0100
@@ -1,3 +1,4 @@
+module.startlevel=2
 release.external/org.eclipse.equinox.common-3.6.0.jar=modules/org-eclipse-equinox-common.jar
 is.autoload=true
 nbm.module.author=Tomas Stupka