--- a/sbsv2/raptor/bin/sbs	Mon Nov 30 21:12:38 2009 +0000
+++ b/sbsv2/raptor/bin/sbs	Tue Dec 01 23:06:30 2009 +0000
@@ -68,6 +68,7 @@
 	__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}
 
     # Command for unifying path strings. For example, "c:\some\path" and
     # "/cygdrive/c/some/path" will both be converted into "c:/some/path".
@@ -87,6 +88,7 @@
 	export CYGWIN='nontsec nosmbntsec'
 
 else
+	export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python262/lib}
 	PATH=$SBS_HOME/$HOSTPLATFORM_DIR/python262/bin:$SBS_HOME/$HOSTPLATFORM_DIR/bin:$PATH
 	LD_LIBRARY_PATH=$SBS_HOME/$HOSTPLATFORM_DIR/python262/lib:$SBS_HOME/$HOSTPLATFORM_DIR/bv/lib:$LD_LIBRARY_PATH
 

--- a/sbsv2/raptor/test/common/raptor_tests.py	Mon Nov 30 21:12:38 2009 +0000
+++ b/sbsv2/raptor/test/common/raptor_tests.py	Tue Dec 01 23:06:30 2009 +0000
@@ -133,7 +133,6 @@
 		for line in manifest:
 			line = line.replace("$(HOSTPLATFORM_DIR)", host_platform)
 			line = line.replace("./", epocroot+"/").rstrip("\n")
-			# Get rid of newline char and add to dictionary
 			all_files[line] = True
 			# This bit makes a record of unique folders into a list
 			pos = line.rfind("/", le)