commit pending changes from build.eclipse.org
diff --git a/releng/build-scripts/build/buildVersions.properties b/releng/build-scripts/build/buildVersions.properties
index 546204a..bb50b6d 100644
--- a/releng/build-scripts/build/buildVersions.properties
+++ b/releng/build-scripts/build/buildVersions.properties
@@ -1,4 +1,4 @@
 #fetchTag=SVN=v20100127
 #fetchTag=SVN=trunk
 buildType=I
-buildId=0.7M4
+buildId=0.7.1
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index fee13dc..3812000 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -47,11 +47,11 @@
 
 # VERSIONS:
 # Eclipse SKD build identifier:
-EVERSION=3.6RC4
+EVERSION=3.6
 # Architecture (as used by OSGi):
 ARCH=`arch`
 # used only locally:
-DROP=${BASEDIR}/drops/S-3.6RC4-201006031500
+DROP=${BASEDIR}/drops/R-3.6-201006080911
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml
index 74b78e4..1874100 100644
--- a/releng/build-scripts/build/p2helper.xml
+++ b/releng/build-scripts/build/p2helper.xml
@@ -21,8 +21,8 @@
                 <outputproperty name="method" value="xml"/>
                 <outputproperty name="encoding" value="UTF-8"/>
                 <outputproperty name="indent" value="yes"/>
-        		<param name="version" value="${jdt.feature.version}"/>
-        		<param name="versionnext" value="${jdt.feature.version.next}"/>
+        		<param name="version" expression="${jdt.feature.version}"/>
+        		<param name="versionnext" expression="${jdt.feature.version.next}"/>
                 <mapper type="glob" from="${content.origFile}" to="${content.transFile}"/>
         </xslt>
         <move file="${otdtUpdatesDir}/${content.transFile}" tofile="${otdtUpdatesDir}/${content.origFile}" overwrite="yes"/>