--- a/javaextensions/satsa/build/javasatsa_0x2002DCCE.mmp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javaextensions/satsa/build/javasatsa_0x2002DCCE.mmp	Wed Oct 13 14:23:59 2010 +0300
@@ -45,7 +45,6 @@
 MACRO		RD_JAVA_HTTP_EMC_ENABLED
 MACRO		RD_JAVA_NGA_ENABLED
 MACRO		RD_JAVA_PROXIMITY_LISTENER_ENABLED
-MACRO		RD_JAVA_PIM_MULTICAL_ENABLED
 MACRO		RD_JAVA_OPENC_BETA_PATCH
 MACRO		RD_JAVA_INSTALLERUI_ENABLED
 MACRO		RD_JAVA_PREWARM
@@ -53,6 +52,7 @@
 MACRO		RD_JAVA_MIDPRMS_DB
 MACRO		__SYMBIAN32__
 MACRO		J9EPOC32
+MACRO		RD_JAVA_OMJ_FSERVER
 
 SYSTEMINCLUDE		../../../../../mw/qt/mkspecs/common/symbian
 SYSTEMINCLUDE		../framework/inc
@@ -164,8 +164,10 @@
 LIBRARY		certstore.lib
 LIBRARY		charconv.lib
 LIBRARY		cms.lib
+LIBRARY		aknnotify.lib
 LIBRARY		eiksrv.lib
 LIBRARY		ctframework.lib
+LIBRARY		ctsecdlgs.lib
 LIBRARY		customapi.lib
 LIBRARY		efsrv.lib
 LIBRARY		etel.lib
@@ -176,8 +178,6 @@
 LIBRARY		WimClient.lib
 LIBRARY		estlib.lib
 LIBRARY		cryptography.lib
-LIBRARY		aknnotify.lib
-LIBRARY		ctsecdlgs.lib
 LIBRARY		javautils.lib
 LIBRARY		libpthread.lib
 LIBRARY		libstdcppv5.lib
@@ -204,7 +204,7 @@
 #endif
 OPTION GCCE -fvisibility-inlines-hidden
 
-VERSION 10.525
+VERSION 10.0
 
 ARMFPU softvfp