--- a/brdbootldr/ubootldr/inflate.c	Thu Dec 17 09:24:54 2009 +0200
+++ b/brdbootldr/ubootldr/inflate.c	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/bsptemplate/asspandvariant/template_variant/exiic.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/bsptemplate/asspandvariant/template_variant/exiic.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -57,8 +57,7 @@
 //SYMBIAN_BASE_SYSTEMINCLUDE(template)
 //SYMBIAN_BASE_SYSTEMINCLUDE(template/specific)
 
-//library			iic.lib			// iic.lib provides the IIC Controller. 
-									// This is included from the variant.mmh, so not needed here.
+//library			iic.lib			// commented out as this iic.lib is now included from iic_channel.mmh
 
 library     VariantTarget(gpio,lib)
 

--- a/bsptemplate/asspandvariant/template_variant/variant.mmh	Thu Dec 17 09:24:54 2009 +0200
+++ b/bsptemplate/asspandvariant/template_variant/variant.mmh	Thu Jan 07 13:38:45 2010 +0200
@@ -154,5 +154,5 @@
 #endif
 
 // Uncomment the following if IIC Controller is required
-library		iic.lib
+// library		iic.lib  // commented out as this iic.lib is now included from iic_channel.mmh
 

--- a/halservices/hal/inc/hal_data.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/halservices/hal/inc/hal_data.h	Thu Jan 07 13:38:45 2010 +0200
@@ -1287,6 +1287,7 @@
 		EMachineUid_EmuBoard=0x1200afed,
 		EMachineUid_OmapH6=0x10286564,
 		EMachineUid_OmapZoom=0x10286565,
+		EMachineUid_STE8500=0x101FF810,
 		};
 
 

--- a/kernel/eka/bld.inf	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/bld.inf	Thu Jan 07 13:38:45 2010 +0200
@@ -55,7 +55,7 @@
 include/collate.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(collate.h)
 include/k32keys.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(k32keys.h)
 include/k32keys.inl								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(k32keys.inl)
-include/u32std.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(u32std.h)
+include/u32std.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32std.h)
 include/u32hal.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32hal.h)
 include/u32property.h							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32property.h)
 include/u32exec.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(u32exec.h)
@@ -312,11 +312,12 @@
 include/e32svr.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32svr.h)
 include/e32notif.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32notif.h)
 include/e32ktran.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ktran.h)
-include/e32debug.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32debug.h)
+include/e32debug.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32debug.h)
 include/e32lmsg.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32lmsg.h)
 include/e32event.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32event.h)
 include/e32event_private.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32event_private.h)
-include/e32ldr.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ldr.h)
+include/e32ldr.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32ldr.h)
+include/e32ldr_private.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ldr_private.h)
 include/e32test.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(e32test.h)
 include/e32uid.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32uid.h)
 include/e32ver.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(e32ver.h)

--- a/kernel/eka/compsupp/bld.inf	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/bld.inf	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -34,7 +34,7 @@
 
 PRJ_MMPFILES
 
-#ifndef GCCXML
+#if !defined GCCXML && !defined GCCE
 
     symcpp/scppnwdl.mmp
     rvct/dfprvct-thunk.mmp
@@ -61,8 +61,6 @@
 
 PRJ_EXTENSIONS
 
-#ifndef GCCXML
-
 // Unzip RVCT3.1 runtime if being built with RVCT2.2 or RVCT4.0
 
 start extension tools/compsupp
@@ -76,7 +74,7 @@
 option  TODIR $(EPOCROOT)epoc32/release
 
 end
-#endif
 
-#endif
+#endif // #if !defined GCCXML && !defined GCCE
 
+

--- a/kernel/eka/compsupp/compsupp.iby	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/compsupp.iby	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/gcce/gcce.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/gcce/gcce.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/aeabidiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/aeabidiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/aeabimem.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/aeabimem.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r2.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r2.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r3.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r3.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r4.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r4.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r5.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r5.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r6.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r6.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/call_via_rx/r7.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/call_via_rx/r7.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfpaeabi.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfpaeabi_common.mmh	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi_common.mmh	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfpaeabi_vfpv2.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfpaeabi_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct-thunk.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct-thunk.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct-thunk.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct-thunk.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct_common.mmh	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct_common.mmh	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dfprvct_vfpv2.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dfprvct_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/dllexp.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/dllexp.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/drtaeabi.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/drtaeabi.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/drtaeabi.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/drtaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/drtrvct.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/drtrvct_common.mmh	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct_common.mmh	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/drtrvct_vfpv2.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/drtrvct_vfpv2.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/ksrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/ksrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/no_extras.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/no_extras.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/rtabort.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/rtabort.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/rtdiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/rtdiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/rtexit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/rtexit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/rtlib.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/rtlib.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/rtraise.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/rtraise.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/sftfpini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/sftfpini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/type_info.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/type_info.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/ucppfini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/ucppfini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/ucppinit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/ucppinit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct/usrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct/usrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar2.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar2.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar3.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar3.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar4.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar4.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar5.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar5.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar6.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar6.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/callviar7.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/callviar7.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/cppinit.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/cppinit.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/dllexp.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/dllexp.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/ksrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/ksrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtabort.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtabort.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtdiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtdiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rte32dll.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rte32dll.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtexit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtexit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtlib.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtlib.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtopdel.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtopdel.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtopnew.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtopnew.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rtraise.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rtraise.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/rvct2_0.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/rvct2_0.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/sftfpini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/sftfpini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/ucppfini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/ucppfini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/ucppinit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/ucppinit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/udfp.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/udfp.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/udfpfrce.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/udfpfrce.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/udrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/udrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/udrtfrce.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/udrtfrce.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_0/usrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_0/usrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/aeabidiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/aeabidiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/aeabimem.cia	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/aeabimem.cia	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar2.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar2.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar3.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar3.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar4.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar4.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar5.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar5.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar6.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar6.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/callviar7.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/callviar7.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/cppinit.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/cppinit.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dfpaeabi.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfpaeabi.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -27,7 +27,7 @@
 
 	DCB "#<SYMEDIT>#\n"
 
-// Standard double precision floating-point arithmetic helper functions
+/// Standard double precision floating-point arithmetic helper functions
 
 	DCB "EXPORT __aeabi_dadd\n"
 	DCB "EXPORT __aeabi_ddiv\n"
@@ -36,7 +36,7 @@
 	DCB "EXPORT __aeabi_drsub\n"
 	DCB "EXPORT __aeabi_dsub\n"
 
-// Standard double precision floating-point comparison helper functions
+/// Standard double precision floating-point comparison helper functions
 
 	DCB "EXPORT __aeabi_cdcmpeq\n"
 	DCB "EXPORT __aeabi_cdcmple\n"
@@ -48,7 +48,7 @@
 	DCB "EXPORT __aeabi_dcmpgt\n"
 	DCB "EXPORT __aeabi_dcmpun\n"
 
-// Standard single precision floating-point arithmetic helper functions
+/// Standard single precision floating-point arithmetic helper functions
 
 	DCB "EXPORT __aeabi_fadd\n"
 	DCB "EXPORT __aeabi_fdiv\n"
@@ -57,7 +57,7 @@
 	DCB "EXPORT __aeabi_frsub\n"
 	DCB "EXPORT __aeabi_fsub\n"
 
-// Standard single precision floating-point comparison helper functions
+/// Standard single precision floating-point comparison helper functions
 
 	DCB "EXPORT __aeabi_cfcmpeq\n"
 	DCB "EXPORT __aeabi_cfcmple\n"
@@ -69,7 +69,7 @@
 	DCB "EXPORT __aeabi_fcmpgt\n"
 	DCB "EXPORT __aeabi_fcmpun\n"
 
-// Standard floating-point to integer conversions
+/// Standard floating-point to integer conversions
 
 	DCB "EXPORT __aeabi_d2iz\n"
 	DCB "EXPORT __aeabi_d2uiz\n"
@@ -80,12 +80,12 @@
 	DCB "EXPORT __aeabi_f2lz\n"
 	DCB "EXPORT __aeabi_f2ulz\n"
 
-// Standard conversions between floating types
+/// Standard conversions between floating types
 
 	DCB "EXPORT __aeabi_d2f\n"
 	DCB "EXPORT __aeabi_f2d\n"
 
-// Standard integer to floating-point conversions
+/// Standard integer to floating-point conversions
 
 	DCB "EXPORT __aeabi_i2d\n"
 	DCB "EXPORT __aeabi_ui2d\n"

--- a/kernel/eka/compsupp/rvct2_1/dfpaeabi.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfpaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dfprvct2_1-thunk.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfprvct2_1-thunk.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dfprvct2_1-thunk.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfprvct2_1-thunk.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dfprvct2_1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfprvct2_1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dfprvct2_1.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dfprvct2_1.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/dllexp.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/dllexp.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/drtaeabi.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/drtaeabi.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -117,7 +117,7 @@
 	DCB "EXPORT __cxa_finalize\n"
 #endif
 
-// Exception Support from here. Not needed by system side code.
+/// Exception Support from here. Not needed by system side code.
 #ifndef __KERNEL_MODE__
 	// Standard (user-visible) C++  exception related functions
 	DCB "EXPORT _ZSt9terminatev\n"

--- a/kernel/eka/compsupp/rvct2_1/drtaeabi.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/drtaeabi.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/drtrvct2_1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/drtrvct2_1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/drtrvct2_1.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/drtrvct2_1.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/ksrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/ksrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/ksrt2_1.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/ksrt2_1.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtabort.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtabort.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtdiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtdiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rte32dll.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rte32dll.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtexit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtexit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtlib.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtlib.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtopdel.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtopdel.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtopnew.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtopnew.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rtraise.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rtraise.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/rvct2_1.h	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/rvct2_1.h	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/sftfpini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/sftfpini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/ucppfini.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/ucppfini.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/ucppinit.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/ucppinit.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/ucppinit_aeabi.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/ucppinit_aeabi.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/usrt.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/usrt.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_1/usrt2_1.mmp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_1/usrt2_1.mmp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/aeabidiv0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/aeabidiv0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/aeabimem.cia	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/aeabimem.cia	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/callviar0.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/callviar0.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/callviar1.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/callviar1.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/callviar2.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/callviar2.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/callviar3.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/callviar3.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *

--- a/kernel/eka/compsupp/rvct2_2/callviar4.cpp	Thu Dec 17 09:24:54 2009 +0200
+++ b/kernel/eka/compsupp/rvct2_2/callviar4.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *