--- a/bldsystemtools/commonbldutils/BCupdateXML.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/BCupdateXML.pl	Fri Feb 19 23:57:18 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/bldsystemtools/commonbldutils/BuildExpiry.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/BuildExpiry.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/BuildStamp.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/BuildStamp.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/BxCopy.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/BxCopy.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/BxCopy.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/BxCopy.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/ExportCBR.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/ExportCBR.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/FileOps.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/FileOps.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/FileOps.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/FileOps.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/BragStatus.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/BragStatus.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/Changelists.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/Changelists.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/FaultsData.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/FaultsData.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/FileRead.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/FileRead.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenAutoSmokeTestResult.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenAutoSmokeTestResult.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenPostBuildResult.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenPostBuildResult.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenResult.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenResult.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/GenResult.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/GenResult.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/ZipDiamondsXml.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/ZipDiamondsXml.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/myutils.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/myutils.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/publishDiamonds.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/publishDiamonds.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.py	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.py	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/InstallDevKit.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/InstallDevKit.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -5,7 +5,7 @@
 # Copyright (c) 1997-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/bldsystemtools/commonbldutils/PC_P4Table.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/PC_P4Table.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/PC_P4Table.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/PC_P4Table.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/PreBldChecks.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/PreBldChecks.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/PreBldChecks.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/PreBldChecks.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/ReleaseNotes.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/ReleaseNotes.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -3,7 +3,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/bldsystemtools/commonbldutils/SFPostProcessResults.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/SFPostProcessResults.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,13 +1,16 @@
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-# This component and the accompanying materials are made available
-# 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".
 #
-# Initial Contributors:
-# Nokia Corporation - initial contribution
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+# This material, including documentation and any related 
+# computer programs, is protected by copyright controlled by 
+# Nokia. All rights are reserved. Copying, including 
+# reproducing, storing, adapting or translating, any 
+# or all of this material requires the prior written consent of 
+# Nokia. This material also contains confidential 
+# information which may not be disclosed to others without the 
+# prior written consent of Nokia.
 #
-# Contributors
+# Contributors:
+#     matti.parnanen@nokia.com
 #
 # Description: Post processes result  CSV file generated by the SFCheckSource.pl
 # Version: 0.5 $optNoIgnore added

--- a/bldsystemtools/commonbldutils/SetP4Client.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/SetP4Client.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/abldcache.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/abldcache.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -3,7 +3,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/bldsystemtools/commonbldutils/bfcClient.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/bfcClient.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/buildenv.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/buildenv.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/buildenv.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/buildenv.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/delta_zip.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/delta_zip.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1999-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/bldsystemtools/commonbldutils/iprtool.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/iprtool.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2000-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/bldsystemtools/commonbldutils/make_directory_tree.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/make_directory_tree.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2006-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/bldsystemtools/commonbldutils/missingstages.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/missingstages.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2006-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/bldsystemtools/commonbldutils/renumber.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/renumber.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/rom_metrics_list.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/rom_metrics_list.pl	Fri Feb 19 23:57:18 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/bldsystemtools/commonbldutils/runcbr.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/runcbr.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/start-perl.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/start-perl.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/bldsystemtools/commonbldutils/subst.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/bldsystemtools/commonbldutils/subst.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/imgtools_os/romkiteka2/Utils/metarombuild.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/Utils/metarombuild.pl	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/group/BLD.INF	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/group/BLD.INF	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/group/release.txt	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/group/release.txt	Fri Feb 19 23:57:18 2010 +0200
@@ -1,3 +1,7 @@
+version 3.15.1
+================
+(Made by Marvin Shi 15/01/2010)
+  1. DEF143368 Changes to omxilcompref.iby cause errors in rombuild for textshell roms.
 Version is unchanged
 ================
 (Made by Zheng Shen, 24/08/2009)

--- a/imgtools_os/romkiteka2/include/DEBUG.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/DEBUG.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/EPOCBASE.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/EPOCBASE.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/ESHELL.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/ESHELL.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/HEADER.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/HEADER.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/MESON.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/MESON.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/OBEYFILE.IBY	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/OBEYFILE.IBY	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/PlatSec.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/PlatSec.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/PlatSecDisabledCapsX.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/PlatSecDisabledCapsX.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/RemovableFeatures.iby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/RemovableFeatures.iby	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/imgtools_os/romkiteka2/include/feature.iby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/feature.iby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/featureUIDs.h	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/featureUIDs.h	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/imgtools_os/romkiteka2/include/kerneltrace.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/kerneltrace.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/pagedrom.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/pagedrom.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/pagedrom_functional.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/pagedrom_functional.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/pagedrom_stressed.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/pagedrom_stressed.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/include/textshell.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/include/textshell.oby	Fri Feb 19 23:57:18 2010 +0200
@@ -4,7 +4,7 @@
 // Copyright (c) 2007-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".
 //
@@ -125,9 +125,7 @@
 #include <traces.iby>
 #include <mmf_plugin.iby>
 #include <omxilcompref.iby>
-#ifdef SYMBIAN_MULTIMEDIA_OPENMAX_IL_V2
 #include <omxilcomp.iby>
-#endif
 #include <omxilcore.iby>
 	
 	#include <inetprotutil.iby>		/* needed for mmfcontrollerframework.dll */

--- a/imgtools_os/romkiteka2/test/incA/phone.hrh	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/incA/phone.hrh	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/incA/testA.iby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/incA/testA.iby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/incB/testB.iby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/incB/testB.iby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/incB/varB.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/incB/varB.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/minimal.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/minimal.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/test.buildrom.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/test.buildrom.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-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/imgtools_os/romkiteka2/test/var1.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/var1.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/var2.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/var2.oby	Fri Feb 19 23:57:18 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/imgtools_os/romkiteka2/test/var3.oby	Tue Feb 02 01:39:43 2010 +0200
+++ b/imgtools_os/romkiteka2/test/var3.oby	Fri Feb 19 23:57:18 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/misccomponents/emulatorlauncher/group/bld.inf	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/group/bld.inf	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 1999-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/misccomponents/emulatorlauncher/perl/epoc.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/perl/epoc.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -3,7 +3,7 @@
 rem Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/misccomponents/emulatorlauncher/perl/epoc.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/perl/epoc.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1999-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/misccomponents/emulatorlauncher/perl/eshell.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/perl/eshell.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -3,7 +3,7 @@
 rem Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
 rem All rights reserved.
 rem This component and the accompanying materials are made available
-rem under the terms of "Eclipse Public License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
 rem which accompanies this distribution, and is available
 rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 rem

--- a/misccomponents/emulatorlauncher/perl/eshell.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/perl/eshell.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1999-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/misccomponents/emulatorlauncher/src/RunPerl.cpp	Tue Feb 02 01:39:43 2010 +0200
+++ b/misccomponents/emulatorlauncher/src/RunPerl.cpp	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 1999-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/sbsv1_os/e32toolp/bldmake/bldmake.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/bldmake/bldmake.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem

--- a/sbsv1_os/e32toolp/bldmake/bldmake.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/bldmake/bldmake.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1997-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/sbsv1_os/e32toolp/bldmake/metabld.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/bldmake/metabld.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2000-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/sbsv1_os/e32toolp/bldmake/wrappermakefile.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/bldmake/wrappermakefile.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-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/sbsv1_os/e32toolp/e32util/_secure_E32Env.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/_secure_E32Env.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1997-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/sbsv1_os/e32toolp/e32util/armasm2as.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/armasm2as.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/checkgcc.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/checkgcc.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1997-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/sbsv1_os/e32toolp/e32util/checksource.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/checksource.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/checksource.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/checksource.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/copyfeaturevariants.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/copyfeaturevariants.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-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/sbsv1_os/e32toolp/e32util/createrfifile.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/createrfifile.pl	Fri Feb 19 23:57:18 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/sbsv1_os/e32toolp/e32util/defutl.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/defutl.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1997-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/sbsv1_os/e32toolp/e32util/deletefeaturevariants.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/deletefeaturevariants.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-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/sbsv1_os/e32toolp/e32util/e32tpver.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/e32tpver.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1997-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".
 #
@@ -25,7 +25,7 @@
 use strict;
 
 sub E32tpver () {
-	my $Version=674; 
+	my $Version=675; 
 }
 
 1;

--- a/sbsv1_os/e32toolp/e32util/efreeze.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/efreeze.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem

--- a/sbsv1_os/e32toolp/e32util/efreeze.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/efreeze.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 1998-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/sbsv1_os/e32toolp/e32util/epocaif.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/epocaif.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/epocmbm.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/epocmbm.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/epocrc.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/epocrc.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem

--- a/sbsv1_os/e32toolp/e32util/epocrc.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/epocrc.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2000-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/sbsv1_os/e32toolp/e32util/featurevariantmap.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/featurevariantmap.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,7 @@
 # Copyright (c) 2007-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/sbsv1_os/e32toolp/e32util/featurevariantparser.pm	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/featurevariantparser.pm	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2007 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/sbsv1_os/e32toolp/e32util/fixsource.bat	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/fixsource.bat	Fri Feb 19 23:57:18 2010 +0200
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem

--- a/sbsv1_os/e32toolp/e32util/gendef.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/gendef.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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/sbsv1_os/e32toolp/e32util/h2inc.pl	Tue Feb 02 01:39:43 2010 +0200
+++ b/sbsv1_os/e32toolp/e32util/h2inc.pl	Fri Feb 19 23:57:18 2010 +0200
@@ -1,7 +1,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".
 #