INTEGRATION: CWS obo12 (1.60.52); FILE MERGED

2007/05/30 12:37:22 obo 1.60.52.3: RESYNC: (1.60-1.61); FILE MERGED
2007/05/29 07:42:31 obo 1.60.52.2: typo
2007/05/24 15:30:24 obo 1.60.52.1: #i76713# DISABLE_ATL,DISABLE_ADO,PROF_EDITION,WINDOWS_VISTA_PSDK

solenv/config/ssolar.cmn

@@ -55,6 +55,8 @@ common
 		DB2PATH
         DEFAULT_TO_ENGLISH_FOR_PACKING
         DIRECTX_SUPPORT
+		DISABLE_ADO
+		DISABLE_ATL
         DISABLE_ENHANCED_COMID
 		DISABLE_JAVA
 		DISABLE_SAL_DBGBOX
@@ -125,6 +127,7 @@ common
         PRODUCTENVCACHE
 		PRODUCTNAME
 		PROEXT
+		PROF_EDITION
 		PROFILE
 		profile
         product
@@ -195,6 +198,7 @@ common
 		use_cygcp
 		use_shl_versions
         VCL
+		WINDOWS_VISTA_PSDK
         WITH_LDAP
 		WST
 		XCLASSPATH
@@ -243,4 +247,3 @@ unxmacxp
 {
 }
 
-