diff --git a/branch-info.txt b/branch-info.txt
index b85d6b0..31cd477 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -7,3 +7,6 @@
 ========================
 svn merge --ignore-ancestry \
   https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -c6276 .
+
+svn merge --ignore-ancestry \
+  https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -r6292:6294 . 
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
index fcf8035..f6229cd 100755
--- a/samples/common.ant.xml
+++ b/samples/common.ant.xml
@@ -79,17 +79,17 @@
       <outofdate>
         <sourcefiles />
         <targetfiles>
-          <pathelement location="${samples.scripts}/@{platform}/${sample.upper}/build.xml" />
+          <pathelement location="${samples.scripts}/${sample.upper}/build.xml" />
         </targetfiles>
         <sequential>
-          <mkdir dir="${samples.scripts}/@{platform}/${sample.upper}" />
+          <mkdir dir="${samples.scripts}/${sample.upper}" />
           <java classname="com.google.gwt.user.tools.WebAppCreator" classpath="${gwt.user.jar}:${gwt.dev.jar}" failonerror="true">
             <!-- Relative path is important! Paths will be relative in final distro -->
-            <sysproperty key="gwt.devjar" value="../../gwt-dev-@{platform}.jar" />
+            <sysproperty key="gwt.devjar" value="../../gwt-dev.jar" />
             <arg value="-XnoEclipse" />
             <arg value="-overwrite" />
             <arg value="-out" />
-            <arg file="${samples.scripts}/@{platform}/${sample.upper}" />
+            <arg file="${samples.scripts}/${sample.upper}" />
             <arg value="com.google.gwt.sample.${sample.lower}.${sample.upper}" />
           </java>
         </sequential>
diff --git a/user/src/com/google/gwt/user/tools/README.txtsrc b/user/src/com/google/gwt/user/tools/README.txtsrc
index dda9750..650d35e 100644
--- a/user/src/com/google/gwt/user/tools/README.txtsrc
+++ b/user/src/com/google/gwt/user/tools/README.txtsrc
@@ -8,6 +8,9 @@
 We've tested against Eclipse 3.3 and 3.4.  Later versions will likely also
 work, earlier versions may not.
 
+If the directory containing this file does not have a .classpath or .project
+file, generate them by running 'ant eclipse.generate'
+
 In Eclipse, go to the File menu and choose:
 
   File -> Import... -> Existing Projects into Workspace
diff --git a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
index b054c1d..8b3ef42 100644
--- a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
@@ -55,21 +55,6 @@
       <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
       <arg value="@moduleName"/>
     </java>
-  </target>
-
-  <target name="oophm" depends="javac" description="Run OOPHM hosted mode">
-    <java failonerror="true" fork="true" classname="@shellClass">
-      <classpath>
-        <pathelement location="${gwt.sdk}/gwt-dev-oophm.jar"/>
-        <pathelement location="src"/>
-        <path refid="project.class.path"/>
-      </classpath>
-      <jvmarg value="-Xmx256M"/>
-      <arg value="-startupUrl"/>
-      <arg value="@startupUrl"/>
-      <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
-      <arg value="@moduleName"/>
-    </java>
   </target>@antEclipseRule
 
   <target name="build" depends="gwtc" description="Build this project" />