--- a/sbsv2/raptor/bin/sbs	Mon Feb 15 14:54:46 2010 +0000
+++ b/sbsv2/raptor/bin/sbs	Tue Feb 16 10:11:06 2010 +0000
@@ -67,8 +67,8 @@
 
 	__MINGW__=${SBS_MINGW:-$SBS_HOME/$HOSTPLATFORM_DIR/mingw}
 	__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
-	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
-	export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python252}
+	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
+	export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python264}
 
     # Command for unifying path strings. For example, "c:\some\path" and
     # "/cygdrive/c/some/path" will both be converted into "c:/some/path".

--- a/sbsv2/raptor/python/raptor_meta.py	Mon Feb 15 14:54:46 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Tue Feb 16 10:11:06 2010 +0000
@@ -31,6 +31,7 @@
 import generic_path
 import subprocess
 import zipfile
+from xml.sax.saxutils import escape
 from mmpparser import *
 
 import time
@@ -2901,7 +2902,7 @@
 				for file in files:
 					if not file.endswith('/'):
 						expfilename = str(generic_path.Join(destination, file))
-						exportwhatlog += "<member>" + expfilename + "</member>\n"
+						exportwhatlog += "<member>" + escape(expfilename) + "</member>\n"
 
 				self.__Raptor.PrintXML("<clean bldinf='" + bldinf_filename + "' mmp='' config=''>\n")
 				self.__Raptor.PrintXML("<zipmarker>" + markerfilename + "</zipmarker>\n")
@@ -2946,7 +2947,7 @@
 						os.utime(expfilename,(accesstime, modifiedtime))
 
 						filecount += 1
-						exportwhatlog+="<member>" + expfilename + "</member>\n"
+						exportwhatlog+="<member>" + escape(expfilename) + "</member>\n"
 					except IOError, e:
 						message = "Could not unzip %s to %s: file %s: %s" %(source, destination, expfilename, str(e))
 						if not self.__Raptor.keepGoing:

--- a/sbsv2/raptor/test/run	Mon Feb 15 14:54:46 2010 +0000
+++ b/sbsv2/raptor/test/run	Tue Feb 16 10:11:06 2010 +0000
@@ -28,7 +28,7 @@
 	SBS_HOME=${SBS_HOME//\\//}
 
 	__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
-	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
+	__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
 
 	# Unify paths.
 

--- a/sbsv2/raptor/test/smoke_suite/whatlog_cache.py	Mon Feb 15 14:54:46 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/whatlog_cache.py	Tue Feb 16 10:11:06 2010 +0000
@@ -28,7 +28,7 @@
 	if 'SBS_PYTHON' in os.environ:
 		pythonRun = "$(SBS_PYTHON)"
 	else:
-		pythonRun = "$(SBS_HOME)/win32/python252/python.exe"
+		pythonRun = "$(SBS_HOME)/win32/python264/python.exe"
 
 	# Build something using the .whatlog variant.  Take the build log and give it to sbsv2cache.py, deducing
 	# the location of the generated cache file from the verbose output.  If generated, dump the cache file to