--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/SBSv2QueryTests.java	Wed Jul 28 17:10:59 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/SBSv2QueryTests.java	Thu Jul 29 10:44:19 2010 -0500
@@ -61,6 +61,8 @@
 	 */
 	public void testQueryBuildConfigsFromSDK() throws Exception {
 		
+		SBSv2QueryUtils.removeAllCachedQueries();  // ensure sbs needs to build an entirely new cache
+		
 		ISymbianSDK sdk = SDKCorePlugin.getSDKManager().getSDK(SDK_ID1, true);
 		assertNotNull(sdk);
 		

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Wed Jul 28 17:10:59 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Thu Jul 29 10:44:19 2010 -0500
@@ -409,7 +409,7 @@
 			deviceType.setUserdeletable("false");
 			deviceType.setUserdeletetable("false");
 			ISymbianSDK sdk = new SymbianSDK(deviceType);
-			if (sdk.getOSVersion().toString().equals("0.0.0")) {
+			if (sdk.getOSVersion().toString().equals("0.0")) {
 				((SymbianSDK)sdk).setOSVersion(new Version("9.5"));
 			}
 

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java	Wed Jul 28 17:10:59 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java	Thu Jul 29 10:44:19 2010 -0500
@@ -57,7 +57,7 @@
 	/**
 	 * Returns the OS version string of this SDK.
 	 *
-	 * @return the OS Version object. If the version cannot be determined it will be "0.0".
+	 * @return the OS Version object. If the version cannot be determined it will be "9.5".
 	 * @deprecated - use ISymbianSDK{@link #getSupportedFeatures()} to figure out the properties of an SDK
 	 */
 	Version getOSVersion();