diff -r 27af159d6518 nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java	Sat Apr 16 18:33:34 2011 +0400
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java	Mon Apr 18 18:51:23 2011 +0200
@@ -797,6 +797,19 @@
                 entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
             } else {
                 entries = scanNetBeansOrgSources(new File(nball), properties, project);
+                        
+                String extra = properties.get("extra.clusters");
+                if (extra != null) {
+                    List<File> arr = new ArrayList<File>();
+                    for (String s : extra.split(":")) {
+                        File cluster = FileUtils.getFileUtils().resolveFile(new File(nball), s);
+                        if (!cluster.exists()) {
+                            throw new BuildException("cluster from extra.clusters does not exist: " + cluster);
+                        }
+                        arr.add(cluster);
+                    }
+                    entries.putAll(scanBinaries(project, arr.toArray(new File[0])));
+                }
             }
         }
     }
diff -r 27af159d6518 nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	Sat Apr 16 18:33:34 2011 +0400
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java	Mon Apr 18 18:51:23 2011 +0200
@@ -1094,19 +1094,22 @@
         File jar = module.getJar();
         if (jar == null) return null;
 
-        OK: if (module.getClusterName() != null && clusterPath != null) {
-            File clusterF = jar.getParentFile();
-            while (clusterF != null) {
-                if (clusterPath.contains(clusterF)) {
-                    break OK;
+        String ec = getProject().getProperty("extra.clusters");
+        if (ec == null) {
+            OK: if (module.getClusterName() != null && clusterPath != null) {
+                File clusterF = jar.getParentFile();
+                while (clusterF != null) {
+                    if (clusterPath.contains(clusterF)) {
+                        break OK;
+                    }
+                    clusterF = clusterF.getParentFile();
                 }
-                clusterF = clusterF.getParentFile();
+                String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
+                        " against because it is part of the cluster " +
+                        jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
+                        "Cluster.path is: " + clusterPath;
+                throw new BuildException(msg, getLocation());
             }
-            String msg = "The module " + cnb + " cannot be " + (runtime ? "run" : "compiled") +
-                    " against because it is part of the cluster " +
-                    jar.getParentFile().getParentFile() + " which is not part of cluster.path in your suite configuration.\n\n" +
-                    "Cluster.path is: " + clusterPath;
-            throw new BuildException(msg, getLocation());
         }
         if (excludedModules != null && excludedModules.contains(cnb)) { // again #68716
             throw new BuildException("Module " + cnb + " excluded from the target platform", getLocation());
diff -r 27af159d6518 nbbuild/cluster.properties
--- a/nbbuild/cluster.properties	Sat Apr 16 18:33:34 2011 +0400
+++ b/nbbuild/cluster.properties	Mon Apr 18 18:51:23 2011 +0200
@@ -41,6 +41,8 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
+extra.clusters=../netbinox-mylyn-sample/eclipse
+
 cluster.config=full
 clusters.prefix=libnb
 
diff -r 27af159d6518 nbbuild/default.xml
--- a/nbbuild/default.xml	Sat Apr 16 18:33:34 2011 +0400
+++ b/nbbuild/default.xml	Mon Apr 18 18:51:23 2011 +0200
@@ -154,7 +154,7 @@
     <available property="clusters.file" file="${nb_all}/ide/launcher/netbeans.clusters" value="${nb_all}/ide/launcher/netbeans.clusters"/>
     <!-- fallback for orphaned modules -->
     <property name="clusters.file" value="${netbeans.dest.dir}/etc/netbeans.clusters"/>
-    <loadfile property="cluster.path.evaluated" srcfile="${clusters.file}">
+    <loadfile property="cluster.path.read" srcfile="${clusters.file}">
         <filterchain>
             <striplinecomments>
                 <comment value="#"/>
@@ -163,6 +163,7 @@
             <striplinebreaks/>
         </filterchain>
     </loadfile>
+    <property name="cluster.path.evaluated" value="${extra.clusters}:${cluster.path.read}"/>
     <path id="cluster.path.id" path="${cluster.path.evaluated}"/>
     <property name="cluster.path.final" refid="cluster.path.id"/>
   </target>
diff -r 27af159d6518 openide.text/nbproject/project.xml
--- a/openide.text/nbproject/project.xml	Sat Apr 16 18:33:34 2011 +0400
+++ b/openide.text/nbproject/project.xml	Mon Apr 18 18:51:23 2011 +0200
@@ -91,6 +91,14 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.eclipse.equinox.common</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>3.5</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff -r 27af159d6518 openide.text/src/org/netbeans/modules/openide/text/Installer.java
--- a/openide.text/src/org/netbeans/modules/openide/text/Installer.java	Sat Apr 16 18:33:34 2011 +0400
+++ b/openide.text/src/org/netbeans/modules/openide/text/Installer.java	Mon Apr 18 18:51:23 2011 +0200
@@ -68,6 +68,8 @@
             Integer v = new Integer(1);
             mimeTypes.put(mimeType, v);
         }
+        Class<?> c = org.eclipse.core.runtime.Assert.class;
+        System.err.println("loaded: " + c);
     }
     
     @Override