# HG changeset patch
# User Daniel Jacobs <daniel.jacobs@nokia.com>
# Date 1270118539 -3600
# Node ID 27b8f8ec3e0b4119e6c9ecbc8ee390fd9831f6d1
# Parent  2fda6cb4a81254de2e2d96291fa5a8309291aa25# Parent  e95d56493ef614e00fd742496f0cab99f4f83c54
Merge.

diff -r e95d56493ef6 -r 27b8f8ec3e0b sbsv2/raptor/bin/sbs_env.bat
--- a/sbsv2/raptor/bin/sbs_env.bat	Thu Apr 01 11:31:21 2010 +0100
+++ b/sbsv2/raptor/bin/sbs_env.bat	Thu Apr 01 11:42:19 2010 +0100
@@ -39,11 +39,11 @@
 
 :sbspython
 @SET __PYTHON__=%SBS_PYTHON%
-@SET SBS_PYTHON=%__PYTHON__%
 @GOTO sbspythonpath
 
 :localpython
 @SET __PYTHON__=%__LOCAL_PYTHON__%
+@SET SBS_PYTHON=%__PYTHON__%
 @SET PYTHONPATH=
 
 :sbspythonpath