Mercurial Mercurial > oss > FCL > sf > os > buildtools / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Catch up from PDK_3.0.h (it's now identical) CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 12:59:11 +0000
branchCompilerCompatibility
changeset 17 849005a0b183
parent 14 275b63638398 (current diff)
parent 15 abe83d2199d3 (diff)
Catch up from PDK_3.0.h (it's now identical)
package_definition.xml file | annotate | diff | comparison | revisions
sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl file | annotate | diff | comparison | revisions
sbsv1_os/e32toolp/group/bld.inf file | annotate | diff | comparison | revisions
toolsandutils/buildsystem/bld.inf file | annotate | diff | comparison | revisions
toolsandutils/buildsystem/extension/base/bootstrap.mk file | annotate | diff | comparison | revisions 
--- a/bldsystemtools/commonbldutils/BCupdateXML.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/BCupdateXML.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/BuildExpiry.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/BuildStamp.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/BxCopy.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/BxCopy.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/ExportCBR.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/FileOps.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/FileOps.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/BragStatus.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/Changelists.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/FaultsData.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/FileRead.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenAutoSmokeTestResult.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenDiamondsXml.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenPostBuildResult.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenResult.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/GenResult.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/ZipDiamondsXml.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/myutils.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/publishDiamonds.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/GenResult/send_xml_to_diamonds.py	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/InstallDevKit.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/PC_P4Table.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/PC_P4Table.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/PreBldChecks.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/PreBldChecks.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/ReleaseNotes.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/SFPostProcessResults.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/SetP4Client.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/abldcache.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/bfcClient.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/buildenv.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/buildenv.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/delta_zip.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/iprtool.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/make_directory_tree.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/missingstages.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/renumber.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/rom_metrics_list.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/runcbr.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/start-perl.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/bldsystemtools/commonbldutils/subst.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/Utils/metarombuild.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/group/BLD.INF	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/group/release.txt	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/DEBUG.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/EPOCBASE.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/ESHELL.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/HEADER.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/MESON.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/OBEYFILE.IBY	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/PlatSec.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/PlatSecDisabledCapsX.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/RemovableFeatures.iby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/feature.iby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/featureUIDs.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/featuredatabase.xml	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/featuredatabase.xml	Sun Mar 14 12:59:11 2010 +0000
@@ -97,9 +97,6 @@
 		<feature name="AmbientLightSensor" statusflags="0x00000001" uid="0x000005F9">
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR"/>
 		</feature>
-		<feature name="CoverDisplay" statusflags="0x00000001" uid="0x00000003">
-			<hrhmacro exclude="SYMBIAN_EXCLUDE_COVER_DISPLAY"/>
-		</feature>
 		<feature name="KeypadNoSlider" statusflags="0x00000001" uid="0x000003F5">
 			<hrhmacro exclude="SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER"/>
 		</feature>
@@ -147,6 +144,354 @@
 			<hrhmacro infeaturesetiby="no" exclude="SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API"/>
 		</feature>
 		<!-- PREQ 2051 - Variation Support - End -->
+<feature name="Camera" statusflags="0x00000001" uid ="0x00000002"></feature>
+<feature name="FmRadio" statusflags="0x00000001" uid ="0x00000005"></feature>
+<feature name="OpenGLES3DApi" statusflags="0x00000001" uid ="0x0000000a"></feature>
+<feature name="BtAudio" statusflags="0x00000001" uid ="0x0000000f"></feature>
+<feature name="Srcs" statusflags="0x00000001" uid ="0x00000011"></feature>
+<feature name="BtImagingProfile" statusflags="0x00000001" uid ="0x00000013"></feature>
+<feature name="Wim" statusflags="0x00000001" uid ="0x00000018"></feature>
+<feature name="SimCertificates" statusflags="0x00000001" uid ="0x00000019"></feature>
+<feature name="SmartCardProv" statusflags="0x00000001" uid ="0x0000001b"></feature>
+<feature name="IAUpdate" statusflags="0x00000001" uid ="0x0000001e"></feature>
+<feature name="Dpb" statusflags="0x00000001" uid ="0x00000020"></feature>
+<feature name="Im" statusflags="0x00000001" uid ="0x00000021"></feature>
+<feature name="ImpsStandaloneIpCir" statusflags="0x00000001" uid ="0x00000022"></feature>
+<feature name="Presence" statusflags="0x00000001" uid ="0x00000024"></feature>
+<feature name="SyncMlDm" statusflags="0x00000001" uid ="0x00000029"></feature>
+<feature name="SyncMlDs" statusflags="0x00000001" uid ="0x0000002a"></feature>
+<feature name="SyncMlDsMMS" statusflags="0x00000001" uid ="0x0000002b"></feature>
+<feature name="SyncMlDsEmail" statusflags="0x00000001" uid ="0x0000002c"></feature>
+<feature name="SyncMlDsCon" statusflags="0x00000001" uid ="0x0000002d"></feature>
+<feature name="SyncMlDsCal" statusflags="0x00000001" uid ="0x0000002e"></feature>
+<feature name="SyncMlDmDs" statusflags="0x00000001" uid ="0x0000002f"></feature>
+<feature name="SyncMlDmIAP" statusflags="0x00000001" uid ="0x00000030"></feature>
+<feature name="SyncMlDmEmail" statusflags="0x00000001" uid ="0x00000031"></feature>
+<feature name="SyncMlDmMMS" statusflags="0x00000001" uid ="0x00000032"></feature>
+<feature name="SyncMlObex" statusflags="0x00000001" uid ="0x00000033"></feature>
+<feature name="SyncMlDsAlert" statusflags="0x00000001" uid ="0x00000034"></feature>
+<feature name="SyncMlDsNotepad" statusflags="0x00000001" uid ="0x00000035"></feature>
+<feature name="SyncMlDmObex" statusflags="0x00000001" uid ="0x00000036"></feature>
+<feature name="SyncMlDmWlan" statusflags="0x00000001" uid ="0x00000037"></feature>
+<feature name="SyncMlDmImps" statusflags="0x00000001" uid ="0x00000039"></feature>
+<feature name="SyncMlDmFota" statusflags="0x00000001" uid ="0x0000003a"></feature>
+<feature name="SyncMlDmVoIP" statusflags="0x00000001" uid ="0x0000003b"></feature>
+<feature name="SyncMlDmSIP" statusflags="0x00000001" uid ="0x0000003c"></feature>
+<feature name="FfNcdEngine" statusflags="0x00000001" uid ="0x0000003d"></feature>
+<feature name="FfNcdUi" statusflags="0x00000001" uid ="0x0000003e"></feature>
+<feature name="VirtualFullscrQwertyInput" statusflags="0x00000001" uid ="0x00000040"></feature>
+<feature name="VirtualItutInput" statusflags="0x00000001" uid ="0x00000041"></feature>
+<feature name="Mp3" statusflags="0x00000001" uid ="0x00000047"></feature>
+<feature name="Sind" statusflags="0x00000001" uid ="0x00000048"></feature>
+<feature name="AmrNb" statusflags="0x00000001" uid ="0x00000049"></feature>
+<feature name="AmrWb" statusflags="0x00000001" uid ="0x0000004a"></feature>
+<feature name="Aac" statusflags="0x00000001" uid ="0x0000004b"></feature>
+<feature name="SymbianMultimediaA3fdevsoundId" statusflags="0x00000001" uid ="0x0000004c"></feature>
+<feature name="Svgt" statusflags="0x00000001" uid ="0x0000004d"></feature>
+<feature name="MacromediaFlash6" statusflags="0x00000001" uid ="0x0000004f"></feature>
+<feature name="Mpeg4VideoEncoding" statusflags="0x00000001" uid ="0x00000050"></feature>
+<feature name="ProtocolGsm" statusflags="0x00000001" uid ="0x00000051"></feature>
+<feature name="ProtocolWcdma" statusflags="0x00000001" uid ="0x00000052"></feature>
+<feature name="SimCard" statusflags="0x00000001" uid ="0x00000058"></feature>
+<feature name="UseDrmEngineInCcp" statusflags="0x00000001" uid ="0x0000005c"></feature>
+<feature name="DrmFull" statusflags="0x00000001" uid ="0x0000005d"></feature>
+<feature name="DrmPhase2" statusflags="0x00000001" uid ="0x0000005f"></feature>
+<feature name="DrmClock" statusflags="0x00000001" uid ="0x00000060"></feature>
+<feature name="DrmOma2" statusflags="0x00000001" uid ="0x00000062"></feature>
+<feature name="Qos" statusflags="0x00000001" uid ="0x00000065"></feature>
+<feature name="LoggerGprs" statusflags="0x00000001" uid ="0x00000067"></feature>
+<feature name="EdgeKnowledge" statusflags="0x00000001" uid ="0x00000068"></feature>
+<feature name="NetworkRegistration" statusflags="0x00000001" uid ="0x00000069"></feature>
+<feature name="ConnMonExtension" statusflags="0x00000001" uid ="0x0000006c"></feature>
+<feature name="ProtocolWlan" statusflags="0x00000001" uid ="0x0000006d"></feature>
+<feature name="Landmarks" statusflags="0x00000001" uid ="0x00000070"></feature>
+<feature name="PrivacyFramework" statusflags="0x00000001" uid ="0x00000073"></feature>
+<feature name="UsbCharging" statusflags="0x00000001" uid ="0x00000077"></feature>
+<feature name="RockerKey" statusflags="0x00000001" uid ="0x00000078"></feature>
+<feature name="LandmarksConverter" statusflags="0x00000001" uid ="0x0000007b"></feature>
+<feature name="LocationSysUi" statusflags="0x00000001" uid ="0x0000007c"></feature>
+<feature name="SelectableEmail" statusflags="0x00000001" uid ="0x0000007d"></feature>
+<feature name="EmailMceIntegration" statusflags="0x00000001" uid ="0x0000007e"></feature>
+<feature name="FfSimlessOfflineSupport" statusflags="0x00000001" uid ="0x00000082"></feature>
+<feature name="CaeVrCustomCommands" statusflags="0x00000001" uid ="0x00000083"></feature>
+<feature name="CameraBurstMode" statusflags="0x00000001" uid ="0x00000084"></feature>
+<feature name="FfEmailFramework" statusflags="0x00000001" uid ="0x00000087"></feature>
+<feature name="JavaMMAPI11" statusflags="0x00000001" uid ="0x0000008f"></feature>
+<feature name="JavaFileAPI" statusflags="0x00000001" uid ="0x00000090"></feature>
+<feature name="JavaPIMAPI" statusflags="0x00000001" uid ="0x00000091"></feature>
+<feature name="Java3DAPI" statusflags="0x00000001" uid ="0x00000092"></feature>
+<feature name="JavaLocationAPI" statusflags="0x00000001" uid ="0x00000093"></feature>
+<feature name="OCSP" statusflags="0x00000001" uid ="0x00000095"></feature>
+<feature name="J2MEWebServicesAPI" statusflags="0x00000001" uid ="0x00000096"></feature>
+<feature name="FfVoiceCallContinuity" statusflags="0x00000001" uid ="0x00000098"></feature>
+<feature name="FfWsNcim" statusflags="0x00000001" uid ="0x00000099"></feature>
+<feature name="BrowserAdaptiveBookm" statusflags="0x00000001" uid ="0x000000a3"></feature>
+<feature name="BrowserUrlCompletion" statusflags="0x00000001" uid ="0x000000a5"></feature>
+<feature name="RssFeeds" statusflags="0x00000001" uid ="0x000000a7"></feature>
+<feature name="Series60NativeBrowser" statusflags="0x00000001" uid ="0x000000a8"></feature>
+<feature name="FfConnectionOverride" statusflags="0x00000001" uid ="0x000000b3"></feature>
+<feature name="FfCapacitiveDisplay" statusflags="0x00000001" uid ="0x000000b7"></feature>
+<feature name="FfTacticons" statusflags="0x00000001" uid ="0x000000b8"></feature>
+<feature name="FfIaupdatePhase2" statusflags="0x00000001" uid ="0x000000b9"></feature>
+<feature name="FfOmaScomoAdapter" statusflags="0x00000001" uid ="0x000000c5"></feature>
+<feature name="FfRuntimeDeviceCapabilityConfiguration" statusflags="0x00000001" uid ="0x000000c6"></feature>
+<feature name="IncludeUsbRndis" statusflags="0x00000001" uid ="0x000000c8"></feature>
+<feature name="SideVolumeKeys" statusflags="0x00000001" uid ="0x000000cf"></feature>
+<feature name="VideoRecorder" statusflags="0x00000001" uid ="0x000000d0"></feature>
+<feature name="OpenGLESSWImplementation" statusflags="0x00000001" uid ="0x000000d2"></feature>
+<feature name="FfAvkonEmotionIconEnabled" statusflags="0x00000001" uid ="0x000000d3"></feature>
+<feature name="FfTarmCapabilityBasedAccess" statusflags="0x00000001" uid ="0x000000d6"></feature>
+<feature name="FfEmailProtocolPlugins" statusflags="0x00000001" uid ="0x000000d7"></feature>
+<feature name="BtSap" statusflags="0x00000001" uid ="0x000000de"></feature>
+<feature name="AtHandler" statusflags="0x00000001" uid ="0x000000df"></feature>
+<feature name="BtTestMode" statusflags="0x00000001" uid ="0x000000e0"></feature>
+<feature name="PushWhiteList" statusflags="0x00000001" uid ="0x000000e3"></feature>
+<feature name="OmaProv" statusflags="0x00000001" uid ="0x000000e4"></feature>
+<feature name="FfContactsRemoteLookup" statusflags="0x00000001" uid ="0x000000ea"></feature>
+<feature name="FfAdditionalFonts" statusflags="0x00000001" uid ="0x000000f1"></feature>
+<feature name="MMS" statusflags="0x00000001" uid ="0x000000f4"></feature>
+<feature name="FfDeviceEncryptionFeature" statusflags="0x00000001" uid ="0x000000fa"></feature>
+<feature name="ffContactsMycard" statusflags="0x00000001" uid ="0x0000010b"></feature>
+<feature name="FfContactsMerge" statusflags="0x00000001" uid ="0x0000010c"></feature>
+<feature name="S60MtpController" statusflags="0x00000001" uid ="0x00000110"></feature>
+<feature name="FfContactsSocial" statusflags="0x00000001" uid ="0x00000111"></feature>
+<feature name="MpegAacEncoding" statusflags="0x00000001" uid ="0x0000011a"></feature>
+<feature name="UseAmrNbCMMFCodec" statusflags="0x00000001" uid ="0x0000011c"></feature>
+<feature name="UseAmrWbCMMFCodec" statusflags="0x00000001" uid ="0x0000011d"></feature>
+<feature name="UseAacCMMFCodec" statusflags="0x00000001" uid ="0x0000011e"></feature>
+<feature name="UseMp3CMMFCodec" statusflags="0x00000001" uid ="0x0000011f"></feature>
+<feature name="UseQcelpCMMFCodec" statusflags="0x00000001" uid ="0x00000120"></feature>
+<feature name="IncludeAmrNbCMMFCodec" statusflags="0x00000001" uid ="0x00000121"></feature>
+<feature name="SimPhonebookMatch" statusflags="0x00000001" uid ="0x00000124"></feature>
+<feature name="CommonTsy" statusflags="0x00000001" uid ="0x00000125"></feature>
+<feature name="CommonDsy" statusflags="0x00000001" uid ="0x00000129"></feature>
+<feature name="CommonVoip" statusflags="0x00000001" uid ="0x0000012a"></feature>
+<feature name="QwertyInput" statusflags="0x00000001" uid ="0x00000199"></feature>
+<feature name="PenSupport" statusflags="0x00000001" uid ="0x0000019a"></feature>
+<feature name="IncludeAmrWbCMMFCodec" statusflags="0x00000001" uid ="0x000001eb"></feature>
+<feature name="IncludeAacCMMFCodec" statusflags="0x00000001" uid ="0x000001ec"></feature>
+<feature name="IncludeMp3CMMFCodec" statusflags="0x00000001" uid ="0x000001ed"></feature>
+<feature name="IncludeQcelpCMMFCodec" statusflags="0x00000001" uid ="0x000001ee"></feature>
+<feature name="Id3V2Metadata" statusflags="0x00000001" uid ="0x000001ef"></feature>
+<feature name="MmfDrmUtility" statusflags="0x00000001" uid ="0x000001f0"></feature>
+<feature name="AudioEffectsApi" statusflags="0x00000001" uid ="0x000001f1"></feature>
+<feature name="AudioResourceIndications" statusflags="0x00000001" uid ="0x000001f3"></feature>
+<feature name="MmCommsEngine" statusflags="0x00000001" uid ="0x000001f5"></feature>
+<feature name="Wma" statusflags="0x00000001" uid ="0x000001f7"></feature>
+<feature name="MmCommsAvController" statusflags="0x00000001" uid ="0x000001f9"></feature>
+<feature name="SupportedFeature1" statusflags="0x00000001" uid ="0x000003e8"></feature>
+<feature name="SupportedFeature2" statusflags="0x00000001" uid ="0x000003ea"></feature>
+<feature name="AvkonELaf" statusflags="0x00000001" uid ="0x000003f2"></feature>
+<feature name="Midi" statusflags="0x00000001" uid ="0x000003f3"></feature>
+<feature name="Help" statusflags="0x00000001" uid ="0x000003f4"></feature>
+<feature name="LunarCalendar" statusflags="0x00000001" uid ="0x000003f9"></feature>
+<feature name="PhoneCnap" statusflags="0x00000001" uid ="0x00000407"></feature>
+<feature name="PhoneTty" statusflags="0x00000001" uid ="0x00000408"></feature>
+<feature name="RealPlayer" statusflags="0x00000001" uid ="0x00000410"></feature>
+<feature name="SettingsProtection" statusflags="0x00000001" uid ="0x0000041a"></feature>
+<feature name="PushSL" statusflags="0x00000001" uid ="0x0000041e"></feature>
+<feature name="DynamicProfiles" statusflags="0x00000001" uid ="0x00000420"></feature>
+<feature name="ExtendedStartup" statusflags="0x00000001" uid ="0x00000421"></feature>
+<feature name="OperatorMenu" statusflags="0x00000001" uid ="0x00000422"></feature>
+<feature name="MultipleProvCtx" statusflags="0x00000001" uid ="0x00000423"></feature>
+<feature name="BrowserNarrowScreen" statusflags="0x00000001" uid ="0x00000424"></feature>
+<feature name="AudioAac" statusflags="0x00000001" uid ="0x00000426"></feature>
+<feature name="AudioPlaylist" statusflags="0x00000001" uid ="0x00000427"></feature>
+<feature name="BrowserProgressInd" statusflags="0x00000001" uid ="0x00000428"></feature>
+<feature name="BrowserFullScr" statusflags="0x00000001" uid ="0x0000042a"></feature>
+<feature name="BrowserFrames" statusflags="0x00000001" uid ="0x0000042d"></feature>
+<feature name="OperatorCache" statusflags="0x00000001" uid ="0x0000042f"></feature>
+<feature name="SmilEditor" statusflags="0x00000001" uid ="0x00000431"></feature>
+<feature name="SeamlessLinks" statusflags="0x00000001" uid ="0x00000432"></feature>
+<feature name="ShowPanics" statusflags="0x00000001" uid ="0x00000433"></feature>
+<feature name="MmcHotswap" statusflags="0x00000001" uid ="0x00000434"></feature>
+<feature name="AlwaysOnLine" statusflags="0x00000001" uid ="0x00000436"></feature>
+<feature name="HttpDigestAuth" statusflags="0x00000001" uid ="0x0000043c"></feature>
+<feature name="SendFileInCall" statusflags="0x00000001" uid ="0x0000043f"></feature>
+<feature name="IPv6" statusflags="0x00000001" uid ="0x00000440"></feature>
+<feature name="CellBroadcast" statusflags="0x00000001" uid ="0x00000442"></feature>
+<feature name="USSD" statusflags="0x00000001" uid ="0x00000443"></feature>
+<feature name="RV9" statusflags="0x00000001" uid ="0x00000446"></feature>
+<feature name="WorldClock" statusflags="0x00000001" uid ="0x0000044a"></feature>
+<feature name="BrowserFileUpload" statusflags="0x00000001" uid ="0x0000044b"></feature>
+<feature name="AlwaysOnLineEmail" statusflags="0x00000001" uid ="0x0000044d"></feature>
+<feature name="BrowserNetscapeAPI" statusflags="0x00000001" uid ="0x0000044f"></feature>
+<feature name="ConnMonUI" statusflags="0x00000001" uid ="0x00000451"></feature>
+<feature name="SmartmsgSMSBookmarkReceiving" statusflags="0x00000001" uid ="0x00000452"></feature>
+<feature name="SmartmsgSMSOperatorLogoReceiving" statusflags="0x00000001" uid ="0x00000456"></feature>
+<feature name="SmartmsgSMSRingingToneReceiving" statusflags="0x00000001" uid ="0x00000457"></feature>
+<feature name="SmartmsgSMSGmsMessageReceiving" statusflags="0x00000001" uid ="0x00000458"></feature>
+<feature name="SmartmsgSMSVcalReceiving" statusflags="0x00000001" uid ="0x0000045a"></feature>
+<feature name="SmartmsgSMSVcardReceiving" statusflags="0x00000001" uid ="0x0000045b"></feature>
+<feature name="SmartmsgSMSVcalSending" statusflags="0x00000001" uid ="0x0000045c"></feature>
+<feature name="SmartmsgSMSVcardSending" statusflags="0x00000001" uid ="0x0000045d"></feature>
+<feature name="EnPolicyDos" statusflags="0x00000001" uid ="0x0000045e"></feature>
+<feature name="BrowserAudioPlugin" statusflags="0x00000001" uid ="0x00000462"></feature>
+<feature name="Layout240_320" statusflags="0x00000001" uid ="0x00000465"></feature>
+<feature name="Layout320_240" statusflags="0x00000001" uid ="0x00000466"></feature>
+<feature name="ScalableIcons" statusflags="0x00000001" uid ="0x00000469"></feature>
+<feature name="Jsr135Support" statusflags="0x00000001" uid ="0x0000046a"></feature>
+<feature name="SvgtViewer" statusflags="0x00000001" uid ="0x00000473"></feature>
+<feature name="UsbDeviceLock" statusflags="0x00000001" uid ="0x00000474"></feature>
+<feature name="AacEncoderPlugin" statusflags="0x00000001" uid ="0x00000475"></feature>
+<feature name="AacPlusDecoderPlugin" statusflags="0x00000001" uid ="0x00000477"></feature>
+<feature name="FlashLiteViewer" statusflags="0x00000001" uid ="0x00000479"></feature>
+<feature name="FlashLiteBrowserPlugin" statusflags="0x00000001" uid ="0x0000047a"></feature>
+<feature name="AccessoryFw" statusflags="0x00000001" uid ="0x0000047e"></feature>
+<feature name="EmailUi" statusflags="0x00000001" uid ="0x00000582"></feature>
+<feature name="InstallerSisx" statusflags="0x00000001" uid ="0x00000583"></feature>
+<feature name="JavaMIDP20" statusflags="0x00000001" uid ="0x00000585"></feature>
+<feature name="SyncMlDsOverHttp" statusflags="0x00000001" uid ="0x00000586"></feature>
+<feature name="JavaJsr205Wma20Support" statusflags="0x00000001" uid ="0x00000587"></feature>
+<feature name="JavaJsr2343DAudioAndMusicCapabilities" statusflags="0x00000001" uid ="0x00000588"></feature>
+<feature name="JavaJsr2262DSvgAPI" statusflags="0x00000001" uid ="0x0000058a"></feature>
+<feature name="JavaJsr177SecurityAndTrustServices" statusflags="0x00000001" uid ="0x0000058b"></feature>
+<feature name="Equalizer" statusflags="0x00000001" uid ="0x000005de"></feature>
+<feature name="CallImagetext" statusflags="0x00000001" uid ="0x000005df"></feature>
+<feature name="ContentDownload" statusflags="0x00000001" uid ="0x000005e0"></feature>
+<feature name="3DMenu" statusflags="0x00000001" uid ="0x000005e7"></feature>
+<feature name="BasicLocationInfoDisplay" statusflags="0x00000001" uid ="0x000005e9"></feature>
+<feature name="SyncMlDsAiwProvider" statusflags="0x00000001" uid ="0x000005ec"></feature>
+<feature name="JapaneseLargerDictionary" statusflags="0x00000001" uid ="0x000005ed"></feature>
+<feature name="IncludeEaacplusCmmfcodec" statusflags="0x00000001" uid ="0x000005f1"></feature>
+<feature name="UseEaacplusCmmfCodec" statusflags="0x00000001" uid ="0x000005f2"></feature>
+<feature name="Xdm" statusflags="0x00000001" uid ="0x000005f3"></feature>
+<feature name="XdmXcap" statusflags="0x00000001" uid ="0x000005f4"></feature>
+<feature name="XdmLocalStorage" statusflags="0x00000001" uid ="0x000005f5"></feature>
+<feature name="UpnpStack" statusflags="0x00000001" uid ="0x000005f8"></feature>
+<feature name="UsbPictbridge" statusflags="0x00000001" uid ="0x000005fb"></feature>
+<feature name="UpnpAvcp" statusflags="0x00000001" uid ="0x000005fd"></feature>
+<feature name="UsbMultiPersonality" statusflags="0x00000001" uid ="0x000005fe"></feature>
+<feature name="S60FmRadioApplication" statusflags="0x00000001" uid ="0x00000603"></feature>
+<feature name="TvOut" statusflags="0x00000001" uid ="0x00000604"></feature>
+<feature name="SatCallControl" statusflags="0x00000001" uid ="0x00000605"></feature>
+<feature name="SatBip" statusflags="0x00000001" uid ="0x00000606"></feature>
+<feature name="SatDisplayText" statusflags="0x00000001" uid ="0x00000607"></feature>
+<feature name="SatGetInkey" statusflags="0x00000001" uid ="0x00000608"></feature>
+<feature name="SatGetInput" statusflags="0x00000001" uid ="0x00000609"></feature>
+<feature name="SatLanguageNotification" statusflags="0x00000001" uid ="0x0000060a"></feature>
+<feature name="SatLaunchBrowser" statusflags="0x00000001" uid ="0x0000060b"></feature>
+<feature name="SatMoSmControl" statusflags="0x00000001" uid ="0x0000060c"></feature>
+<feature name="SatPlayTone" statusflags="0x00000001" uid ="0x0000060d"></feature>
+<feature name="SatProvideLocalInfo" statusflags="0x00000001" uid ="0x0000060e"></feature>
+<feature name="SatRefresh" statusflags="0x00000001" uid ="0x0000060f"></feature>
+<feature name="SatSelectItem" statusflags="0x00000001" uid ="0x00000610"></feature>
+<feature name="SatSendDtfm" statusflags="0x00000001" uid ="0x00000611"></feature>
+<feature name="SatSendSm" statusflags="0x00000001" uid ="0x00000612"></feature>
+<feature name="SatSendSs" statusflags="0x00000001" uid ="0x00000613"></feature>
+<feature name="SatSendUssd" statusflags="0x00000001" uid ="0x00000614"></feature>
+<feature name="SatSetupCall" statusflags="0x00000001" uid ="0x00000615"></feature>
+<feature name="SatSetUpEventList" statusflags="0x00000001" uid ="0x00000616"></feature>
+<feature name="SatSetUpIdleModeText" statusflags="0x00000001" uid ="0x00000617"></feature>
+<feature name="SatSetUpMenu" statusflags="0x00000001" uid ="0x00000618"></feature>
+<feature name="AudioMessaging" statusflags="0x00000001" uid ="0x0000061d"></feature>
+<feature name="AvcDecoder" statusflags="0x00000001" uid ="0x0000061f"></feature>
+<feature name="AvcEncoder" statusflags="0x00000001" uid ="0x00000620"></feature>
+<feature name="SapEmbeddedLinkAdapter" statusflags="0x00000001" uid ="0x00000621"></feature>
+<feature name="SapIdleSoftkeyAdapter" statusflags="0x00000001" uid ="0x00000622"></feature>
+<feature name="SapOperatorLogoAdapter" statusflags="0x00000001" uid ="0x00000623"></feature>
+<feature name="SapScreensaverAdapter" statusflags="0x00000001" uid ="0x00000624"></feature>
+<feature name="SapStartupAdapter" statusflags="0x00000001" uid ="0x00000625"></feature>
+<feature name="SapThemesAdapter" statusflags="0x00000001" uid ="0x00000626"></feature>
+<feature name="SapWallpaperAdapter" statusflags="0x00000001" uid ="0x00000627"></feature>
+<feature name="SapApplicationManagement" statusflags="0x00000001" uid ="0x00000628"></feature>
+<feature name="SapTerminalControlFw" statusflags="0x00000001" uid ="0x00000629"></feature>
+<feature name="SapPolicyManagement" statusflags="0x00000001" uid ="0x0000062a"></feature>
+<feature name="SapUiSettingServer" statusflags="0x00000001" uid ="0x0000062b"></feature>
+<feature name="BtStereoAudio" statusflags="0x00000001" uid ="0x0000062c"></feature>
+<feature name="RemoteStorageFw" statusflags="0x00000001" uid ="0x0000062d"></feature>
+<feature name="SuplFramework" statusflags="0x00000001" uid ="0x0000062f"></feature>
+<feature name="OmaSuplPlugins" statusflags="0x00000001" uid ="0x00000630"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesApdu" statusflags="0x00000001" uid ="0x00000631"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesPki" statusflags="0x00000001" uid ="0x00000632"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesCrypto" statusflags="0x00000001" uid ="0x00000633"></feature>
+<feature name="ICalSupport" statusflags="0x00000001" uid ="0x00000634"></feature>
+<feature name="RtpStack" statusflags="0x00000001" uid ="0x00000635"></feature>
+<feature name="MeetingRequestEnabler" statusflags="0x00000001" uid ="0x00000636"></feature>
+<feature name="AudioControllerStreaming" statusflags="0x00000001" uid ="0x00000637"></feature>
+<feature name="3GpExtension" statusflags="0x00000001" uid ="0x00000638"></feature>
+<feature name="NpProxy" statusflags="0x00000001" uid ="0x0000063e"></feature>
+<feature name="SyncMlDsSms" statusflags="0x00000001" uid ="0x0000063f"></feature>
+<feature name="BticEnabled" statusflags="0x00000001" uid ="0x00000640"></feature>
+<feature name="MapAndNavigationAiwProvider" statusflags="0x00000001" uid ="0x00000642"></feature>
+<feature name="VirtualKeyboardInput" statusflags="0x00000001" uid ="0x00000643"></feature>
+<feature name="HandwritingRecognitionInput" statusflags="0x00000001" uid ="0x00000644"></feature>
+<feature name="OpenvgSwImplementation" statusflags="0x00000001" uid ="0x00000645"></feature>
+<feature name="BrowserVideoPlugin" statusflags="0x00000001" uid ="0x00000646"></feature>
+<feature name="CameraFullscreenViewfinder" statusflags="0x00000001" uid ="0x00000647"></feature>
+<feature name="DisplayPost" statusflags="0x00000001" uid ="0x0000064a"></feature>
+<feature name="SapDeviceLockEnhancements" statusflags="0x00000001" uid ="0x0000064b"></feature>
+<feature name="Upin" statusflags="0x00000001" uid ="0x0000064c"></feature>
+<feature name="Mediator" statusflags="0x00000001" uid ="0x0000064e"></feature>
+<feature name="Layout240_320_LargeScreen" statusflags="0x00000001" uid ="0x00000655"></feature>
+<feature name="Layout320_240_LargeScreen" statusflags="0x00000001" uid ="0x00000656"></feature>
+<feature name="Layout320_480_Touch" statusflags="0x00000001" uid ="0x0000065b"></feature>
+<feature name="Layout480_320_Touch" statusflags="0x00000001" uid ="0x0000065c"></feature>
+<feature name="ArmAvc" statusflags="0x00000001" uid ="0x0000065e"></feature>
+<feature name="UiZoom" statusflags="0x00000001" uid ="0x0000065f"></feature>
+<feature name="OmaEmailNotifications" statusflags="0x00000001" uid ="0x00000661"></feature>
+<feature name="VideoMenu" statusflags="0x00000001" uid ="0x00000662"></feature>
+<feature name="SipSimplePresenceProtocol" statusflags="0x00000001" uid ="0x00000663"></feature>
+<feature name="PresenceFramework" statusflags="0x00000001" uid ="0x00000665"></feature>
+<feature name="UiTransitionEffects" statusflags="0x00000001" uid ="0x00000666"></feature>
+<feature name="BeatnikAudioengine" statusflags="0x00000001" uid ="0x00000668"></feature>
+<feature name="RealPlayerAsDefault" statusflags="0x00000001" uid ="0x00000669"></feature>
+<feature name="ArmMdfH264Dec" statusflags="0x00000001" uid ="0x0000066a"></feature>
+<feature name="ArmMdfRealvideoDec" statusflags="0x00000001" uid ="0x0000066b"></feature>
+<feature name="ArmMdfH263mpeg4Dec" statusflags="0x00000001" uid ="0x0000066c"></feature>
+<feature name="ArmMdfPostprocessor" statusflags="0x00000001" uid ="0x0000066d"></feature>
+<feature name="ThaiCalendar" statusflags="0x00000001" uid ="0x0000066e"></feature>
+<feature name="SvgtScreensaverPlugin" statusflags="0x00000001" uid ="0x0000066f"></feature>
+<feature name="GeneralSearchFramework" statusflags="0x00000001" uid ="0x00000670"></feature>
+<feature name="GeneralSearchUi" statusflags="0x00000001" uid ="0x00000671"></feature>
+<feature name="ChatNG" statusflags="0x00000001" uid ="0x00000672"></feature>
+<feature name="MobileActiveSync" statusflags="0x00000001" uid ="0x00000673"></feature>
+<feature name="RemoteLock" statusflags="0x00000001" uid ="0x00000674"></feature>
+<feature name="WindowsMedia" statusflags="0x00000001" uid ="0x00000675"></feature>
+<feature name="WindowsMediaDrm" statusflags="0x00000001" uid ="0x00000676"></feature>
+<feature name="MultimediaSharing" statusflags="0x00000001" uid ="0x00000678"></feature>
+<feature name="BrandingServer" statusflags="0x00000001" uid ="0x00000679"></feature>
+<feature name="PenSupportCalibration" statusflags="0x00000001" uid ="0x0000067a"></feature>
+<feature name="PlugAndPlayMobileServices" statusflags="0x00000001" uid ="0x0000067b"></feature>
+<feature name="DialupNetworking" statusflags="0x00000001" uid ="0x0000067c"></feature>
+<feature name="UpnpMediaserver" statusflags="0x00000001" uid ="0x0000067d"></feature>
+<feature name="MrtSdkLibraries" statusflags="0x00000001" uid ="0x0000067f"></feature>
+<feature name="JavaESWT" statusflags="0x00000001" uid ="0x00000680"></feature>
+<feature name="HwrmTargetModifierPlugin" statusflags="0x00000001" uid ="0x00000681"></feature>
+<feature name="HsxpaSupport" statusflags="0x00000001" uid ="0x00000682"></feature>
+<feature name="JavaApiEnhancementsIap" statusflags="0x00000001" uid ="0x00000683"></feature>
+<feature name="JavaApiEnhancementsMobinfo" statusflags="0x00000001" uid ="0x00000684"></feature>
+<feature name="VfpHwSupport" statusflags="0x00000001" uid ="0x00000685"></feature>
+<feature name="MmcLock" statusflags="0x00000001" uid ="0x00000687"></feature>
+<feature name="EditKey" statusflags="0x00000001" uid ="0x00000688"></feature>
+<feature name="SlideshowScreensaver" statusflags="0x00000001" uid ="0x0000068c"></feature>
+<feature name="SyncMlDmOta" statusflags="0x00000001" uid ="0x0000068f"></feature>
+<feature name="SyncMlIsync" statusflags="0x00000001" uid ="0x00000690"></feature>
+<feature name="ImageViewer" statusflags="0x00000001" uid ="0x00000692"></feature>
+<feature name="MmcEject" statusflags="0x00000001" uid ="0x00000693"></feature>
+<feature name="OmaImps12" statusflags="0x00000001" uid ="0x00000694"></feature>
+<feature name="BtPbap" statusflags="0x00000001" uid ="0x00000696"></feature>
+<feature name="Java" statusflags="0x00000001" uid ="0x00000697"></feature>
+<feature name="UsbRemotePersonality" statusflags="0x00000001" uid ="0x0000069a"></feature>
+<feature name="WebWidgets" statusflags="0x00000001" uid ="0x0000069b"></feature>
+<feature name="XspExtensionManager" statusflags="0x00000001" uid ="0x0000069c"></feature>
+<feature name="IndicRomContent" statusflags="0x00000001" uid ="0x0000069e"></feature>
+<feature name="OnScreenDialer" statusflags="0x00000001" uid ="0x000006a0"></feature>
+<feature name="MediaTransferProtocol" statusflags="0x00000001" uid ="0x000006a1"></feature>
+<feature name="AllowUpgradeHelix" statusflags="0x00000001" uid ="0x000006a3"></feature>
+<feature name="Layout640_360_Touch" statusflags="0x00000001" uid ="0x000006a4"></feature>
+<feature name="Layout360_640_Touch" statusflags="0x00000001" uid ="0x000006a5"></feature>
+<feature name="LocationCentre" statusflags="0x00000001" uid ="0x000006a6"></feature>
+<feature name="AsynchFileSaveQueue" statusflags="0x00000001" uid ="0x000006a7"></feature>
+<feature name="SyncMlDsBookmark" statusflags="0x00000001" uid ="0x000006aa"></feature>
+<feature name="PowerSave" statusflags="0x00000001" uid ="0x000006ad"></feature>
+<feature name="TouchCallHandling" statusflags="0x00000001" uid ="0x000006b3"></feature>
+<feature name="TactileFeedback" statusflags="0x00000001" uid ="0x000006b6"></feature>
+<feature name="AutoRedialForVideoCall" statusflags="0x00000001" uid ="0x000006bb"></feature>
+<feature name="BrowserProgressiveDownload" statusflags="0x00000001" uid ="0x000006bc"></feature>
+<feature name="ProductIncludesHomeScreenEasyDialing" statusflags="0x00000001" uid ="0x000013dd"></feature>
+<feature name="HlpClearKey" statusflags="0x00000001" uid ="0x00002af8"></feature>
+<feature name="HlpMsk" statusflags="0x00000001" uid ="0x00002afb"></feature>
 	</featureset>
 	
 	<defaultfeaturerange higheruid="0x10281805" loweruid="0x10279806"></defaultfeaturerange>
--- a/imgtools_os/romkiteka2/include/kerneltrace.oby	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/kerneltrace.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/pagedrom.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/pagedrom_functional.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/pagedrom_stressed.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/include/textshell.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/incA/phone.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/incA/testA.iby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/incB/testB.iby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/incB/varB.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/minimal.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/test.buildrom.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/var1.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/var2.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/imgtools_os/romkiteka2/test/var3.oby	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/perl/epoc.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/perl/epoc.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/perl/eshell.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/perl/eshell.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/misccomponents/emulatorlauncher/src/RunPerl.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/package_definition.xml	Mon Mar 08 21:44:30 2010 +0000
+++ b/package_definition.xml	Sun Mar 14 12:59:11 2010 +0000
@@ -47,9 +47,6 @@
       <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="test">
         <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
       </component>
-      <component id="romutils" name="ROM Utilities" filter="gt" purpose="development">
-        <unit bldFile="sbsv1_os/romutils/group" mrp="sbsv1_os/romutils/group/tools_romutils.mrp"/>
-      </component>
 	  </collection>
 	  <collection id="imgtools_os" name="Image Tools" level="fw">
       <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
--- a/sbsv1_os/e32toolp/bldmake/bldmake.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/bldmake/bldmake.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/bldmake/bldmake.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/bldmake/metabld.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/bldmake/wrappermakefile.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/_secure_E32Env.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/armasm2as.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/checkgcc.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/checksource.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/checksource.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/copyfeaturevariants.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/createrfifile.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/defutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/deletefeaturevariants.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/e32tpver.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/efreeze.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/efreeze.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/epocaif.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/epocmbm.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/epocrc.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/epocrc.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/featurevariantmap.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/featurevariantparser.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/fixsource.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/gendef.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/h2inc.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/listfeaturevariants.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/listfeaturevariants.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makedef.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/makedef.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/prepdef.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/prepdef.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/e32util/preprocessor.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/preprocessor.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/e32util/selectbootmak.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/selectbootmak.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/set-rvct.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/e32util/set-rvct.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/conv_khronos_hdr_to_cpp.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/conv_khronos_hdr_to_cpp.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/conv_khronos_openvg_hdr_to_cpp.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/ecopyfile.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/ecopyfile.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/emkdir.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/emkdir.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/ermdir.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/ermdir.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/err_formatter.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/err_formatter.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/genutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/genutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/listzip.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/listzip.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/modload.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/modload.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/output.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/output.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/pathutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/pathutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/genutil/prepfile.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/genutil/prepfile.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -37,96 +37,159 @@
 ../binutils/scpp.exe			/epoc32/tools/scpp.exe
 ../genutil/listzip.pl			/epoc32/tools/listzip.pl
 
-../genutil/conv_khronos_hdr_to_cpp.pl /epoc32/tools/conv_khronos_hdr_to_cpp.pl
-../genutil/conv_khronos_openvg_hdr_to_cpp.pl /epoc32/tools/conv_khronos_openvg_hdr_to_cpp.pl 
+// Bootstrap e32toolp via an extention makefile which calls setupprj.bat
+../../../toolsandutils/buildsystem/extension/tools/abld_update.meta 	/epoc32/tools/makefile_templates/tools/abld_update.meta
+../../../toolsandutils/buildsystem/extension/tools/abld_update.mk 		/epoc32/tools/makefile_templates/tools/abld_update.mk
+
+../../../toolsandutils/buildsystem/extension/app-services/buildstubsis.meta 		/epoc32/tools/makefile_templates/app-services/buildstubsis.meta
+../../../toolsandutils/buildsystem/extension/app-services/buildstubsis.mk 		/epoc32/tools/makefile_templates/app-services/buildstubsis.mk
+../../../toolsandutils/buildsystem/extension/app-services/buildupgradesis.meta 		/epoc32/tools/makefile_templates/app-services/buildupgradesis.meta
+../../../toolsandutils/buildsystem/extension/app-services/buildupgradesis.mk 		/epoc32/tools/makefile_templates/app-services/buildupgradesis.mk
+../../../toolsandutils/buildsystem/extension/app-services/wlddatabasekit_sec.meta	/epoc32/tools/makefile_templates/app-services/wlddatabasekit_sec.meta
+../../../toolsandutils/buildsystem/extension/app-services/wlddatabasekit_sec.mk 		/epoc32/tools/makefile_templates/app-services/wlddatabasekit_sec.mk
+../../../toolsandutils/buildsystem/extension/application-protocols/buildstubsis.meta 	/epoc32/tools/makefile_templates/application-protocols/buildstubsis.meta
+../../../toolsandutils/buildsystem/extension/application-protocols/buildstubsis.mk 	/epoc32/tools/makefile_templates/application-protocols/buildstubsis.mk
+../../../toolsandutils/buildsystem/extension/base/bootstrap.meta 	/epoc32/tools/makefile_templates/base/bootstrap.meta
+../../../toolsandutils/buildsystem/extension/base/bootstrap.mk 		/epoc32/tools/makefile_templates/base/bootstrap.mk
+../../../toolsandutils/buildsystem/extension/base/config.meta 		/epoc32/tools/makefile_templates/base/config.meta
+../../../toolsandutils/buildsystem/extension/base/config.mk 		/epoc32/tools/makefile_templates/base/config.mk
+../../../toolsandutils/buildsystem/extension/base/copy_default.meta 	/epoc32/tools/makefile_templates/base/copy_default.meta
+../../../toolsandutils/buildsystem/extension/base/copy_default.mk 	/epoc32/tools/makefile_templates/base/copy_default.mk
+../../../toolsandutils/buildsystem/extension/base/genexec.meta 		/epoc32/tools/makefile_templates/base/genexec.meta
+../../../toolsandutils/buildsystem/extension/base/genexec.mk 		/epoc32/tools/makefile_templates/base/genexec.mk
+../../../toolsandutils/buildsystem/extension/base/h2_genbootinc.meta 	/epoc32/tools/makefile_templates/base/h2_genbootinc.meta
+../../../toolsandutils/buildsystem/extension/base/h2_genbootinc.mk 	/epoc32/tools/makefile_templates/base/h2_genbootinc.mk
+../../../toolsandutils/buildsystem/extension/base/h2_restricted_coreldr.meta 	/epoc32/tools/makefile_templates/base/h2_restricted_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/h2_restricted_coreldr.mk 	/epoc32/tools/makefile_templates/base/h2_restricted_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/h4_genbootinc.meta 		/epoc32/tools/makefile_templates/base/h4_genbootinc.meta
+../../../toolsandutils/buildsystem/extension/base/h4_genbootinc.mk 		/epoc32/tools/makefile_templates/base/h4_genbootinc.mk
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_coreldr.meta 	/epoc32/tools/makefile_templates/base/h4_restricted_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_coreldr.mk 	/epoc32/tools/makefile_templates/base/h4_restricted_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_on_coreldr.meta 	/epoc32/tools/makefile_templates/base/h4_restricted_on_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_on_coreldr.mk 	/epoc32/tools/makefile_templates/base/h4_restricted_on_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_on_miniboot.meta 	/epoc32/tools/makefile_templates/base/h4_restricted_on_miniboot.meta
+../../../toolsandutils/buildsystem/extension/base/h4_restricted_on_miniboot.mk	/epoc32/tools/makefile_templates/base/h4_restricted_on_miniboot.mk
+../../../toolsandutils/buildsystem/extension/base/integrator_lmnand2_coreldr.meta 	/epoc32/tools/makefile_templates/base/integrator_lmnand2_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/integrator_lmnand2_coreldr.mk 		/epoc32/tools/makefile_templates/base/integrator_lmnand2_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/integrator_lmnand2_miniboot.meta 	/epoc32/tools/makefile_templates/base/integrator_lmnand2_miniboot.meta
+../../../toolsandutils/buildsystem/extension/base/integrator_lmnand2_miniboot.mk 	/epoc32/tools/makefile_templates/base/integrator_lmnand2_miniboot.mk
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.meta 	/epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.mk 		/epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_genbootinc.meta				/epoc32/tools/makefile_templates/base/ne1_tb_genbootinc.meta
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_genbootinc.mk 				/epoc32/tools/makefile_templates/base/ne1_tb_genbootinc.mk
+../../../toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.meta		/epoc32/tools/makefile_templates/base/lab_restricted_miniboot.meta
+../../../toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.mk		/epoc32/tools/makefile_templates/base/lab_restricted_miniboot.mk
+../../../toolsandutils/buildsystem/extension/base/lubbock_coreldr.meta 		/epoc32/tools/makefile_templates/base/lubbock_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/lubbock_coreldr.mk 		/epoc32/tools/makefile_templates/base/lubbock_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/lubbock_miniboot.meta 		/epoc32/tools/makefile_templates/base/lubbock_miniboot.meta
+../../../toolsandutils/buildsystem/extension/base/lubbock_miniboot.mk 		/epoc32/tools/makefile_templates/base/lubbock_miniboot.mk
+../../../toolsandutils/buildsystem/extension/base/nand_fbr_offset.meta 		/epoc32/tools/makefile_templates/base/nand_fbr_offset.meta
+../../../toolsandutils/buildsystem/extension/base/nand_fbr_offset.mk 		/epoc32/tools/makefile_templates/base/nand_fbr_offset.mk
+../../../toolsandutils/buildsystem/extension/base/omap3_genbootinc.meta		/epoc32/tools/makefile_templates/base/omap3_genbootinc.meta
+../../../toolsandutils/buildsystem/extension/base/omap3_genbootinc.mk		/epoc32/tools/makefile_templates/base/omap3_genbootinc.mk
+../../../toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.meta		/epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.meta
+../../../toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.mk		/epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.mk
+../../../toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.flm		/epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.flm
+../../../toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.xml		/epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.xml
+../../../toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.flm		/epoc32/tools/makefile_templates/base/lab_restricted_miniboot.flm
+../../../toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.xml		/epoc32/tools/makefile_templates/base/lab_restricted_miniboot.xml
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.flm		/epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.flm
+../../../toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.xml		/epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.xml
+../../../toolsandutils/buildsystem/extension/base/base_rvct_common.mk		/epoc32/tools/makefile_templates/base/base_rvct_common.mk
+../../../toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta 	/epoc32/tools/makefile_templates/converged-comms/createcommdbs.meta
+../../../toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk 	/epoc32/tools/makefile_templates/converged-comms/createcommdbs.mk
+../../../toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta 	/epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.meta
+../../../toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk 	/epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.mk
+../../../toolsandutils/buildsystem/extension/graphics/gen_khronos_cpp_from_hdr.meta		/epoc32/tools/makefile_templates/graphics/gen_khronos_cpp_from_hdr.meta
+../../../toolsandutils/buildsystem/extension/graphics/gen_khronos_cpp_from_hdr.mk		/epoc32/tools/makefile_templates/graphics/gen_khronos_cpp_from_hdr.mk
+../../../toolsandutils/buildsystem/extension/graphics/gen_khronos_openvg_cpp_from_hdr.meta	/epoc32/tools/makefile_templates/graphics/gen_khronos_openvg_cpp_from_hdr.meta
+../../../toolsandutils/buildsystem/extension/graphics/gen_khronos_openvg_cpp_from_hdr.mk	/epoc32/tools/makefile_templates/graphics/gen_khronos_openvg_cpp_from_hdr.mk
+../../../toolsandutils/buildsystem/extension/graphics/genpdrs.meta 		/epoc32/tools/makefile_templates/graphics/genpdrs.meta
+../../../toolsandutils/buildsystem/extension/graphics/genpdrs.mk 		/epoc32/tools/makefile_templates/graphics/genpdrs.mk
+../../../toolsandutils/buildsystem/extension/security/upsserver.meta 	/epoc32/tools/makefile_templates/security/upsserver.meta
+../../../toolsandutils/buildsystem/extension/security/upsserver.mk 		/epoc32/tools/makefile_templates/security/upsserver.mk
+../../../toolsandutils/buildsystem/extension/syslibs/conversiontable.meta 	/epoc32/tools/makefile_templates/syslibs/conversiontable.meta
+../../../toolsandutils/buildsystem/extension/syslibs/conversiontable.mk 		/epoc32/tools/makefile_templates/syslibs/conversiontable.mk
+../../../toolsandutils/buildsystem/extension/syslibs/fm_copyfile_to_winscw_zdrive.meta 	/epoc32/tools/makefile_templates/syslibs/fm_copyfile_to_winscw_zdrive.meta
+../../../toolsandutils/buildsystem/extension/syslibs/fm_copyfile_to_winscw_zdrive.mk 	/epoc32/tools/makefile_templates/syslibs/fm_copyfile_to_winscw_zdrive.mk
+../../../toolsandutils/buildsystem/extension/syslibs/generate_cpp.meta 		/epoc32/tools/makefile_templates/syslibs/generate_cpp.meta
+../../../toolsandutils/buildsystem/extension/syslibs/generate_cpp.mk 		/epoc32/tools/makefile_templates/syslibs/generate_cpp.mk
+../../../toolsandutils/buildsystem/extension/syslibs/generate_snm.meta 		/epoc32/tools/makefile_templates/syslibs/generate_snm.meta
+../../../toolsandutils/buildsystem/extension/syslibs/generate_snm.mk 		/epoc32/tools/makefile_templates/syslibs/generate_snm.mk
+../../../toolsandutils/buildsystem/extension/techview/uiklaf_resource.meta	/epoc32/tools/makefile_templates/techview/uiklaf_resource.meta
+../../../toolsandutils/buildsystem/extension/techview/uiklaf_resource.mk		/epoc32/tools/makefile_templates/techview/uiklaf_resource.mk
+../../../toolsandutils/buildsystem/extension/tools/features.meta 	/epoc32/tools/makefile_templates/tools/features.meta
+../../../toolsandutils/buildsystem/extension/tools/features.mk 		/epoc32/tools/makefile_templates/tools/features.mk
+../../../toolsandutils/buildsystem/extension/tools/kif.meta		/epoc32/tools/makefile_templates/tools/kif.meta
+../../../toolsandutils/buildsystem/extension/tools/kif.mk		/epoc32/tools/makefile_templates/tools/kif.mk
+../../../toolsandutils/buildsystem/extension/tools/stlport.meta 		/epoc32/tools/makefile_templates/tools/stlport.meta
+../../../toolsandutils/buildsystem/extension/tools/stlport.mk 		/epoc32/tools/makefile_templates/tools/stlport.mk
+../../../toolsandutils/buildsystem/extension/tools/compsupp.meta		/epoc32/tools/makefile_templates/tools/compsupp.meta
+../../../toolsandutils/buildsystem/extension/tools/compsupp.mk 		/epoc32/tools/makefile_templates/tools/compsupp.mk
+../../../toolsandutils/buildsystem/extension/tools/x86tool.meta 		/epoc32/tools/makefile_templates/tools/x86tool.meta
+../../../toolsandutils/buildsystem/extension/tools/x86tool.mk 		/epoc32/tools/makefile_templates/tools/x86tool.mk
 ../../../toolsandutils/buildsystem/extension/tools/ant_launch.flm	/epoc32/tools/makefile_templates/tools/ant_launch.flm
 ../../../toolsandutils/buildsystem/extension/tools/ant_launch.xml	/epoc32/tools/makefile_templates/tools/ant_launch.xml
+../../../toolsandutils/buildsystem/shell/cmd.mk 				/epoc32/tools/shell/cmd.mk
+../../../toolsandutils/buildsystem/shell/generic.mk 			/epoc32/tools/shell/generic.mk
+../../../toolsandutils/buildsystem/shell/sh.mk				/epoc32/tools/shell/sh.mk
 
-// Other - mostly SBSv1
+
+PRJ_TESTEXPORTS
 
-../bldmake/abld.pl    /epoc32/tools/abld.pl
-../bldmake/bldmake.bat    /epoc32/tools/bldmake.bat
-../bldmake/bldmake.pl    /epoc32/tools/bldmake.pl
-../bldmake/linkdeps.pl    /epoc32/tools/linkdeps.pl
-../bldmake/metabld.bat    /epoc32/tools/metabld.bat
-../bldmake/metabld.pl    /epoc32/tools/metabld.pl
-../bldmake/wrappermakefile.pm    /epoc32/tools/wrappermakefile.pm
-../e32util/_secure_e32env.pm    /epoc32/tools/e32env.pm
-../e32util/armasm2as.pl    /epoc32/tools/armasm2as.pl
-../e32util/checkgcc.pm    /epoc32/tools/checkgcc.pm
-../e32util/checksource.pl    /epoc32/tools/checksource.pl
-../e32util/checksource.pm    /epoc32/tools/checksource.pm
-../e32util/copyfeaturevariants.pl    /epoc32/tools/copyfeaturevariants.pl
-../e32util/deletefeaturevariants.pl    /epoc32/tools/deletefeaturevariants.pl
-../e32util/efreeze.bat    /epoc32/tools/efreeze.bat
-../e32util/epocaif.pl    /epoc32/tools/epocaif.pl
-../e32util/epocmbm.pl    /epoc32/tools/epocmbm.pl
-../e32util/epocrc.bat    /epoc32/tools/epocrc.bat
-../e32util/epocrc.pl    /epoc32/tools/epocrc.pl
-../e32util/featurevariantmap.pm    /epoc32/tools/featurevariantmap.pm
-../e32util/featurevariantparser.pm    /epoc32/tools/featurevariantparser.pm
-../e32util/fixsource.bat    /epoc32/tools/fixsource.bat
-../e32util/genshimsrc.bat    /epoc32/tools/genshimsrc.bat
-../e32util/listfeaturevariants.pl    /epoc32/tools/listfeaturevariants.pl
-../e32util/preprocessor.pm    /epoc32/tools/preprocessor.pm
-../e32util/selectbootmak.pl    /epoc32/tools/selectbootmak.pl
-../genutil/ecopyfile.pl    /epoc32/tools/ecopyfile.pl
-../genutil/emkdir.pl    /epoc32/tools/emkdir.pl
-../genutil/ermdir.pl    /epoc32/tools/ermdir.pl
-../genutil/err_formatter.pl    /epoc32/tools/err_formatter.pl
-../genutil/genutl.pm    /epoc32/tools/genutl.pm
-../genutil/modload.pm    /epoc32/tools/modload.pm
-../genutil/output.pm    /epoc32/tools/output.pm
-../genutil/prepfile.pm    /epoc32/tools/prepfile.pm
-../makmake/_secure_trgtype.pm    /epoc32/tools/trgtype.pm
-../makmake/makdeps.pm    /epoc32/tools/makdeps.pm
-../makmake/makhelp.pm    /epoc32/tools/makhelp.pm
-../makmake/makmake.bat    /epoc32/tools/makmake.bat
-../makmake/makmake.pl    /epoc32/tools/makmake.pl
-../makmake/mmp.pm    /epoc32/tools/mmp.pm
-../memtrace/memtrace.bat    /epoc32/tools/memtrace.bat
-../memtrace/memtrace.pl    /epoc32/tools/memtrace.pl
-../platform/armutl.pm    /epoc32/tools/armutl.pm
-../platform/armv5smp.bsf    /epoc32/tools/armv5smp.bsf
-../platform/armv6.bsf    /epoc32/tools/armv6.bsf
-../platform/armv6_abiv1.bsf    /epoc32/tools/armv6_abiv1.bsf
-../platform/armv6smp.bsf    /epoc32/tools/armv6smp.bsf
-../platform/armv6t2.bsf    /epoc32/tools/armv6t2.bsf
-../platform/armv7.bsf    /epoc32/tools/armv7.bsf
-../platform/bpabiutl.pm    /epoc32/tools/bpabiutl.pm
-../platform/cl_arm.pm    /epoc32/tools/cl_arm.pm
-../platform/cl_bpabi.pm    /epoc32/tools/cl_bpabi.pm
-../platform/cl_codewarrior.pm    /epoc32/tools/cl_codewarrior.pm
-../platform/cl_edg.pm    /epoc32/tools/cl_edg.pm
-../platform/cl_gcc.pm    /epoc32/tools/cl_gcc.pm
-../platform/cl_gccxml.pm    /epoc32/tools/cl_gccxml.pm
-../platform/cl_generic.pm    /epoc32/tools/cl_generic.pm
-../platform/cl_mingw.pm    /epoc32/tools/cl_mingw.pm
-../platform/cl_tools.pm    /epoc32/tools/cl_tools.pm
-../platform/cl_vscw.pm    /epoc32/tools/cl_vscw.pm
-../platform/cl_win.pm    /epoc32/tools/cl_win.pm
-../platform/cl_x86.pm    /epoc32/tools/cl_x86.pm
-../platform/cl_x86gcc.pm    /epoc32/tools/cl_x86gcc.pm
-../platform/cw_link_descriptor_template.cwlink    /epoc32/tools/cw_link_descriptor_template.cwlink
-../platform/cw_link_descriptor_template_v2.cwlink    /epoc32/tools/cw_link_descriptor_template_v2.cwlink
-../platform/cw_project_template_v3.xml    /epoc32/tools/cw_project_template_v3.xml
-../platform/cw_project_template_v4.xml    /epoc32/tools/cw_project_template_v4.xml
-../platform/default_plats.txt    /epoc32/tools/default_plats.txt
-../platform/default_plats_v2.txt    /epoc32/tools/default_plats_v2.txt
-../platform/e32plat.pm    /epoc32/tools/e32plat.pm
-../platform/e32variant.pm    /epoc32/tools/e32variant.pm
-../platform/fcloggerutl.pm    /epoc32/tools/fcloggerutl.pm
-../platform/filenamepolicyexclusions.txt    /epoc32/tools/filenamepolicyexclusions.txt
-../platform/findimp.pl    /epoc32/tools/findimp.pl
-../platform/gccev6.bsf    /epoc32/tools/gccev6.bsf
-../platform/gccev6t2.bsf    /epoc32/tools/gccev6t2.bsf
-../platform/gccev7.bsf    /epoc32/tools/gccev7.bsf
-../platform/ide_cw.pm    /epoc32/tools/ide_cw.pm
-../platform/ide_vc6.pm    /epoc32/tools/ide_vc6.pm
-../platform/lockit_info.pm    /epoc32/tools/lockit_info.pm
-../platform/winutl.pm    /epoc32/tools/winutl.pm
-../toolinfo/gcce_plat2set.pm    /epoc32/tools/gcce_plat2set.pm
-../toolinfo/rvct_plat2set.pm    /epoc32/tools/rvct_plat2set.pm
-../toolinfo/rvct_ver2set.pm    /epoc32/tools/rvct_ver2set.pm
+../../../toolsandutils/buildsystem/extension/app-services/tzlocaltestserver.meta	/epoc32/tools/makefile_templates/app-services/tzlocaltestserver.meta
+../../../toolsandutils/buildsystem/extension/app-services/tzlocaltestserver.mk		/epoc32/tools/makefile_templates/app-services/tzlocaltestserver.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/bafl_copytestfiles.meta	/epoc32/tools/makefile_templates/syslibs/test/bafl_copytestfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/bafl_copytestfiles.mk		/epoc32/tools/makefile_templates/syslibs/test/bafl_copytestfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/bafl_resource_files.meta	/epoc32/tools/makefile_templates/syslibs/test/bafl_resource_files.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/bafl_resource_files.mk	/epoc32/tools/makefile_templates/syslibs/test/bafl_resource_files.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copydatfile.meta	/epoc32/tools/makefile_templates/syslibs/test/centrep_copydatfile.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copydatfile.mk	/epoc32/tools/makefile_templates/syslibs/test/centrep_copydatfile.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copyincentrepsrv.meta		/epoc32/tools/makefile_templates/syslibs/test/centrep_copyincentrepsrv.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copyincentrepsrv.mk		/epoc32/tools/makefile_templates/syslibs/test/centrep_copyincentrepsrv.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfile.meta		/epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfile.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfile.mk		/epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfile.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfilev2.meta		/epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfilev2.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfilev2.mk		/epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfilev2.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_testpostbuild.meta		/epoc32/tools/makefile_templates/syslibs/test/charconv_testpostbuild.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_testpostbuild.mk		/epoc32/tools/makefile_templates/syslibs/test/charconv_testpostbuild.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_tiso8859x_generate_cpp.meta		/epoc32/tools/makefile_templates/syslibs/test/charconv_tiso8859x_generate_cpp.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_tiso8859x_generate_cpp.mk		/epoc32/tools/makefile_templates/syslibs/test/charconv_tiso8859x_generate_cpp.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_tsnmdata.meta		/epoc32/tools/makefile_templates/syslibs/test/charconv_tsnmdata.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/charconv_tsnmdata.mk			/epoc32/tools/makefile_templates/syslibs/test/charconv_tsnmdata.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/dbms_copytestdbscfiles.meta		/epoc32/tools/makefile_templates/syslibs/test/dbms_copytestdbscfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/dbms_copytestdbscfiles.mk		/epoc32/tools/makefile_templates/syslibs/test/dbms_copytestdbscfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_buildsis.meta			/epoc32/tools/makefile_templates/syslibs/test/ecom3_buildsis.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_buildsis.mk			/epoc32/tools/makefile_templates/syslibs/test/ecom3_buildsis.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_postbuild.meta			/epoc32/tools/makefile_templates/syslibs/test/ecom3_postbuild.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_postbuild.mk			/epoc32/tools/makefile_templates/syslibs/test/ecom3_postbuild.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_relocatetarget.meta		/epoc32/tools/makefile_templates/syslibs/test/ecom3_relocatetarget.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/ecom3_relocatetarget.mk		/epoc32/tools/makefile_templates/syslibs/test/ecom3_relocatetarget.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/featmgr_moveplugin.meta		/epoc32/tools/makefile_templates/syslibs/test/featmgr_moveplugin.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/featmgr_moveplugin.mk			/epoc32/tools/makefile_templates/syslibs/test/featmgr_moveplugin.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/logeng_copytestfiles.meta		/epoc32/tools/makefile_templates/syslibs/test/logeng_copytestfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/logeng_copytestfiles.mk		/epoc32/tools/makefile_templates/syslibs/test/logeng_copytestfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/sql_copyperfsqltestfiles.meta		/epoc32/tools/makefile_templates/syslibs/test/sql_copyperfsqltestfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/sql_copyperfsqltestfiles.mk		/epoc32/tools/makefile_templates/syslibs/test/sql_copyperfsqltestfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/sql_copysqltestfiles.meta		/epoc32/tools/makefile_templates/syslibs/test/sql_copysqltestfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/sql_copysqltestfiles.mk		/epoc32/tools/makefile_templates/syslibs/test/sql_copysqltestfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/sqlite3_copysqlite3testfiles.meta	/epoc32/tools/makefile_templates/syslibs/test/sqlite3_copysqlite3testfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/sqlite3_copysqlite3testfiles.mk	/epoc32/tools/makefile_templates/syslibs/test/sqlite3_copysqlite3testfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/sqlite3_securecopytestfiles.meta	/epoc32/tools/makefile_templates/syslibs/test/sqlite3_securecopytestfiles.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/sqlite3_securecopytestfiles.mk	/epoc32/tools/makefile_templates/syslibs/test/sqlite3_securecopytestfiles.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_sitestfiledist.meta		/epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_sitestfiledist.mk			/epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_stringdictionary00tagtable.meta	/epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_stringdictionary00tagtable.mk	/epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_syncmltestfiledist.meta		/epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_syncmltestfiledist.mk		/epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_wmltestfiledist.meta		/epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_wmltestfiledist.mk		/epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.mk
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_xmlcmatchdatapostbuild.meta	/epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.meta
+../../../toolsandutils/buildsystem/extension/syslibs/test/xml_xmlcmatchdatapostbuild.mk		/epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.mk
+../../../toolsandutils/buildsystem/extension/syslibs/word_template.meta			/epoc32/tools/makefile_templates/syslibs/word_template.meta
+../../../toolsandutils/buildsystem/extension/syslibs/word_template.mk			/epoc32/tools/makefile_templates/syslibs/word_template.mk
 
-#include "../../../toolsandutils/buildsystem/bld.inf"
+PRJ_EXTENSIONS
+START EXTENSION tools/abld_update
+END
--- a/sbsv1_os/e32toolp/group/perlprep.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/perlprep.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/group/release.txt	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/release.txt	Sun Mar 14 12:59:11 2010 +0000
@@ -1,3 +1,9 @@
+Version 0.01.675
+================
+(Made by Marvin Shi 18/01/2009)
+1) Marvin Shi
+	DEF143085  Bug 151 - bldmake is not in PDK2.0c 
+
 Version 0.01.674
 ================
 (Made by Zheng Shen 16/12/2009)
--- a/sbsv1_os/e32toolp/group/setupprj.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/setupprj.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -26,9 +26,9 @@
 
 BEGIN {
 	$EPOCRoot = $ENV{EPOCROOT};
+	$EPOCRoot .= "\\" unless($EPOCRoot =~ /\\$/);
 	die "ERROR: Must set the EPOCROOT environment variable\n" if (!defined($EPOCRoot));
 	$EPOCRoot =~ s-/-\\-go;	# for those working with UNIX shells
-	die "ERROR: EPOCROOT must be an absolute path\n" if ($EPOCRoot !~ /^\\/);
 	die "ERROR: EPOCROOT must not be a UNC path\n" if ($EPOCRoot =~ /^\\\\/);
 	die "ERROR: EPOCROOT must end with a backslash\n" if ($EPOCRoot !~ /\\$/);
 	die "ERROR: EPOCROOT must specify an existing directory\n" if (!-d $EPOCRoot);
@@ -79,21 +79,6 @@
 while ($GroupDir=~s-\\\.\\-\\-go) { }
 while ($GroupDir=~s-\\(?!\.{2}\\)[^\\]*\\\.{2}(?=\\)--go) { }
 
-my $GroupToRoot=&UpToRoot($GroupDir);
-chop $GroupToRoot;
-
-my $GroupToToolsPath="$GroupToRoot$EPOCToolsPath";
-
-my $GroupToToolsConfigFilePath="$GroupToRoot$EPOCToolsConfigFilePath";
-
-my $GroupToDocsPath="$GroupToRoot$DocsPath";
-	
-my $GroupToTemplatePath="$GroupToRoot$TemplateFilePath";
-
-my $GroupToShellPath="$GroupToRoot$ShellFilePath";
-
-my $GroupToBinPath="$GroupToRoot$BinFilePath";
-
 $GroupDir=~s-\\$--o;	# remove trailing backslash
 chdir "$GroupDir" or die "Can't cd to $GroupDir: $!\n";
 
@@ -132,18 +117,21 @@
 
 closedir CONFIGDIR;
 
-opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
-my @Docs = map lc $_, readdir SUBDIR;
-@Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+my @Docs;
+if (-d "..\\Docs") {
+	opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
+	@Docs = map lc $_, readdir SUBDIR;
+	@Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+  closedir SUBDIR;	
+}
 	
-closedir SUBDIR;	
 
 open TEMPLATEFILESUBDIR, "\"dir \/s \/b \/a-d ..\\..\\..\\toolsandutils\\buildsystem\\extension\" |";
 my @TemplateFiles=();
 my %TemplateDirs;
 while (<TEMPLATEFILESUBDIR>)
 	{
-	next if ($_ !~ /\.(mk|meta)$/i);	
+	next if ($_ !~ /\.(mk|meta|flm|xml)$/i);	
 	$_ =~ s/^.*\\buildsystem\\extension\\//i;
 	chomp $_;
 	push @TemplateFiles, $_;
@@ -185,7 +173,7 @@
 	"\@goto invoke\n",
 	"\n",
 	"#!perl\n",
-	"unless (\@ARGV==1 && \$ARGV[0]=~/^(deb|rel|clean)\$/io) {\n",
+	"unless (\@ARGV==1 && \$ARGV[0]=~/^(deb|rel|clean|releasables)\$/io) {\n",
 	"	die\n",
 	"		\"E32TOOLP's bld.bat - usage\\n\",\n",
 	"		\"BLD [param]\\n\",\n",
@@ -195,9 +183,17 @@
 	"}\n",
 	"my \$Param=lc \$ARGV[0];\n",
 	"chdir \"$PrintGroupDir\";\n",
+	"if (\$Param =~ /releasables/i)\n",
+	"{\n",
+	"open PIPE, \"..\\\\binutils\\\\make -s -f e32toolp.make \$Param |\" or die \"Can't invoke make: \$!\\n\";\n",
+	"while (<PIPE>) { print \$_; }\n",
+	"close PIPE;\n",
+	"\n",
+	"exit;\n",
+	"}\n",
 	"print \"..\\\\binutils\\\\make -s -f e32toolp.make \$Param\\n\";\n",
 	"open PIPE, \"..\\\\binutils\\\\make -s -f e32toolp.make \$Param |\" or die \"Can't invoke make: \$!\\n\";\n",
-	"while (<PIPE>) {}\n",
+	"while (<PIPE>) { }\n",
 	"close PIPE;\n",
 	"\n",
 	"__END__\n",
@@ -224,53 +220,60 @@
 	"endif\n",
 	"\n",
 	"\n",
-	"$GroupToToolsPath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToToolsPath\n", 
+	"$EPOCToolsPath :\n",
+	"\t\@perl -w ..\\genutil\\emkdir.pl $EPOCToolsPath\n", 
 	"\n",
-	"$GroupToTemplatePath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToTemplatePath\n", 
+	"$TemplateFilePath :\n",
+	"\t\@perl -w ..\\genutil\\emkdir.pl $TemplateFilePath\n", 
 	"\n"
 );
 
 foreach (sort keys %TemplateDirs) {
 	&Output(
-	"$GroupToTemplatePath\\$_ :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToTemplatePath\\$_\n", 
+	"$TemplateFilePath\\$_ :\n",
+	"\t\@perl -w ..\\genutil\\emkdir.pl $TemplateFilePath\\$_\n", 
 	"\n"
 	);
 }
 
 foreach (sort keys %BinDirs) {
  	&Output(
- 	"$GroupToBinPath\\$_ :\n",
- 	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToBinPath\\$_\n", 
+ 	"$BinFilePath\\$_ :\n",
+ 	"\t\@perl -w ..\\genutil\\emkdir.pl $BinFilePath\\$_\n", 
  	"\n"
  	);
 }
 
+if (scalar @Docs) {
+	&Output(
+		"$DocsPath :\n",
+		"\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n", 
+		"\n"
+	);
+} else {
+	$DocsPath = "";		# suppresses $DocsPath as a dependency in the main rules
+}
+
 &Output(
-	"$GroupToShellPath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToShellPath\n", 
+	"$ShellFilePath :\n",
+	"\t\@perl -w ..\\genutil\\emkdir.pl $ShellFilePath\n", 
 	"\n",
-	"$GroupToToolsConfigFilePath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToToolsConfigFilePath\n", 
-	"\n",
-	"$GroupToDocsPath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $GroupToDocsPath\n", 
+	"$EPOCToolsConfigFilePath :\n",
+	"\t\@perl -w ..\\genutil\\emkdir.pl $EPOCToolsConfigFilePath\n", 
 	"\n",
 	"\n",
-	"deb : $GroupToToolsPath $GroupToToolsConfigFilePath $GroupToDocsPath $GroupToTemplatePath $GroupToShellPath "
+	"deb : $EPOCToolsPath $EPOCToolsConfigFilePath $DocsPath $TemplateFilePath $ShellFilePath "
 );
 
 foreach (sort keys %TemplateDirs) {
 	&Output(
-	"$GroupToTemplatePath\\$_ "
+	"$TemplateFilePath\\$_ "
 	);
 }
 
 foreach (sort keys %BinDirs) {
  	&Output(
- 	"$GroupToBinPath\\$_ "
+ 	"$BinFilePath\\$_ "
  	);
 }
 
@@ -279,59 +282,59 @@
 my $File;
 foreach $File (keys %Files) {
 	&Output(
-		"\tcopy \"..\\$Files{$File}\" \"$GroupToToolsPath\\$File\" >nul\n"
+		"\tcopy \"..\\$Files{$File}\" \"$EPOCToolsPath\\$File\" >nul\n"
 	);
 }
 
 my $ConfigFile;
 foreach $ConfigFile (@ConfigFiles) {
 	&Output(
-		"\tcopy \"..\\platform\\$ConfigFile\" \"$GroupToToolsConfigFilePath\\$ConfigFile\" >nul\n"
+		"\tcopy \"..\\platform\\$ConfigFile\" \"$EPOCToolsConfigFilePath\\$ConfigFile\" >nul\n"
 	);
 }
 
 foreach $File (@Docs) {
 	&Output(
-			"\tcopy \"..\\Docs\\$File\" \"$GroupToDocsPath\\$File\" >nul\n"
+			"\tcopy \"..\\Docs\\$File\" \"$DocsPath\\$File\" >nul\n"
 	);
 }
 
 my $tfile;
 foreach $tfile (@TemplateFiles) {
 	&Output(
-			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\extension\\$tfile\" \"$GroupToTemplatePath\\$tfile\" >nul\n"
+			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\extension\\$tfile\" \"$TemplateFilePath\\$tfile\" >nul\n"
 	);
 }
 
 my $bfile;
 foreach $bfile (@BinFiles) {
  	&Output(
- 			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\bin\\$bfile\" \"$GroupToBinPath\\$bfile\" >nul\n"
+ 			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\bin\\$bfile\" \"$BinFilePath\\$bfile\" >nul\n"
  	);
 }
 
 my $sfile;
 foreach $sfile (@ShellFiles) {
 	&Output(
-			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\shell\\$sfile\" \"$GroupToShellPath\\$sfile\" >nul\n"
+			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\shell\\$sfile\" \"$ShellFilePath\\$sfile\" >nul\n"
 	);
 }
 
 &Output(
 	"\n",
 	"\n",
-	"rel : $GroupToToolsPath $GroupToToolsConfigFilePath $GroupToDocsPath $GroupToTemplatePath $GroupToShellPath "
+	"rel : $EPOCToolsPath $EPOCToolsConfigFilePath $DocsPath $TemplateFilePath $ShellFilePath "
 );
 
 foreach (sort keys %TemplateDirs) {
 	&Output(
-	"$GroupToTemplatePath\\$_ "
+	"$TemplateFilePath\\$_ "
 	);
 }
 
 foreach (sort keys %BinDirs) {
  	&Output(
- 	"$GroupToBinPath\\$_ "
+ 	"$BinFilePath\\$_ "
  	);
 }
 
@@ -340,48 +343,48 @@
 	
 foreach $File (keys %Files) {
 	&Output(
-		"\t.\\perlprep.bat \"..\\$Files{$File}\" \"$GroupToToolsPath\\$File\"\n"
+		"\t.\\perlprep.bat \"..\\$Files{$File}\" \"$EPOCToolsPath\\$File\"\n"
 	);
 }
 
 foreach $ConfigFile (@ConfigFiles) {
 	&Output(
-		"\tcopy \"..\\platform\\$ConfigFile\" \"$GroupToToolsConfigFilePath\\$ConfigFile\" >nul\n"
+		"\tcopy \"..\\platform\\$ConfigFile\" \"$EPOCToolsConfigFilePath\\$ConfigFile\" >nul\n"
 	);
 }
 
 foreach $File (@Docs) {
 	&Output(
-			"\tcopy \"..\\Docs\\$File\" \"$GroupToDocsPath\\$File\" >nul\n"
+			"\tcopy \"..\\Docs\\$File\" \"$DocsPath\\$File\" >nul\n"
 	);
 }
 
 foreach $tfile (@TemplateFiles) {
 	&Output(
-			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\extension\\$tfile\" \"$GroupToTemplatePath\\$tfile\" >nul\n"
+			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\extension\\$tfile\" \"$TemplateFilePath\\$tfile\" >nul\n"
 	);
 }
 foreach $bfile (@BinFiles) {
  	&Output(
- 			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\bin\\$bfile\" \"$GroupToBinPath\\$bfile\" >nul\n"
+ 			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\bin\\$bfile\" \"$BinFilePath\\$bfile\" >nul\n"
  	);
 }
 foreach $sfile (@ShellFiles) {
 	&Output(
-			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\shell\\$sfile\" \"$GroupToShellPath\\$sfile\" >nul\n"
+			"\tcopy \"..\\..\\..\\toolsandutils\\buildsystem\\shell\\$sfile\" \"$ShellFilePath\\$sfile\" >nul\n"
 	);
 }
 &Output(
 	"\n",
-	"rel deb : $GroupToToolsPath\\make.exe\n",
-	"$GroupToToolsPath\\make.exe: ..\\binutils\\make.exe\n",
+	"rel deb : $EPOCToolsPath\\make.exe\n",
+	"$EPOCToolsPath\\make.exe: ..\\binutils\\make.exe\n",
 	"\tcopy \$\? \$\@\n"
 );
 
 &Output(
 	"\n",
-	"rel deb : $GroupToToolsPath\\scpp.exe\n",
-	"$GroupToToolsPath\\scpp.exe: ..\\binutils\\scpp.exe\n",
+	"rel deb : $EPOCToolsPath\\scpp.exe\n",
+	"$EPOCToolsPath\\scpp.exe: ..\\binutils\\scpp.exe\n",
 	"\tcopy \$\? \$\@\n"
 );
 
@@ -392,32 +395,67 @@
 );
 foreach $File (keys %Files) {
 	&Output(
-		"\t-\$(ERASE) \"$GroupToToolsPath\\$File\"\n"
+		"\t-\$(ERASE) \"$EPOCToolsPath\\$File\"\n"
 	);
 }
 foreach $ConfigFile (@ConfigFiles) {
 	&Output(
-		"\t-\$(ERASE) \"$GroupToToolsConfigFilePath\\$ConfigFile\"\n"
+		"\t-\$(ERASE) \"$EPOCToolsConfigFilePath\\$ConfigFile\"\n"
 	);
 }
 foreach $File (@Docs) {
 	&Output(
-			"\t-\$(ERASE) \"$GroupToDocsPath\\$File\"\n"
+			"\t-\$(ERASE) \"$DocsPath\\$File\"\n"
 	);
 }
 foreach $tfile (@TemplateFiles) {
 	&Output(
-			"\t-\$(ERASE) \"$GroupToTemplatePath\\$tfile\"\n"
+			"\t-\$(ERASE) \"$TemplateFilePath\\$tfile\"\n"
 	);
 }
 foreach $bfile (@BinFiles) {
  	&Output(
- 			"\t-\$(ERASE) \"$GroupToBinPath\\$bfile\"\n"
+ 			"\t-\$(ERASE) \"$BinFilePath\\$bfile\"\n"
  	);
 }
 foreach $sfile (@ShellFiles) {
 	&Output(
-			"\t-\$(ERASE) \"$GroupToShellPath\\$sfile\"\n"
+			"\t-\$(ERASE) \"$ShellFilePath\\$sfile\"\n"
+	);
+}
+
+&Output(
+	"\n",
+	"releasables :\n"
+);
+foreach $File (keys %Files) {
+	&Output(
+		"\t\@echo $EPOCToolsPath\\$File\n"
+	);
+}
+foreach $ConfigFile (@ConfigFiles) {
+	&Output(
+		"\t\@echo $EPOCToolsConfigFilePath\\$ConfigFile\n"
+	);
+}
+foreach $File (@Docs) {
+	&Output(
+			"\t\@echo $DocsPath\\$File\n"
+	);
+}
+foreach $tfile (@TemplateFiles) {
+	&Output(
+			"\t\@echo $TemplateFilePath\\$tfile\n"
+	);
+}
+foreach $bfile (@BinFiles) {
+ 	&Output(
+ 			"\t\@echo $BinFilePath\\$bfile\n"
+ 	);
+}
+foreach $sfile (@ShellFiles) {
+	&Output(
+			"\t\@echo $ShellFilePath\\$sfile\n"
 	);
 }
 
--- a/sbsv1_os/e32toolp/group/setver.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/setver.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/group/tools_e32toolp.mrp	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/group/tools_e32toolp.mrp	Sun Mar 14 12:59:11 2010 +0000
@@ -123,6 +123,8 @@
 binary \epoc32\tools\makefile_templates\application-protocols\buildstubsis.mk
 binary \epoc32\tools\makefile_templates\base\bootstrap.meta
 binary \epoc32\tools\makefile_templates\base\bootstrap.mk
+binary \epoc32\tools\makefile_templates\base\bootstrap.xml
+binary \epoc32\tools\makefile_templates\base\bootstrap.flm
 binary \epoc32\tools\makefile_templates\base\config.meta
 binary \epoc32\tools\makefile_templates\base\config.mk
 binary \epoc32\tools\makefile_templates\base\copy_default.meta
@@ -260,6 +262,8 @@
 binary \epoc32\tools\makefile_templates\tools\stlport.mk
 binary \epoc32\tools\makefile_templates\tools\x86tool.meta
 binary \epoc32\tools\makefile_templates\tools\x86tool.mk
+binary \epoc32\tools\makefile_templates\tools\abld_update.meta
+binary \epoc32\tools\makefile_templates\tools\abld_update.mk
 binary \epoc32\tools\makefile_templates\tools\ant_launch.flm
 binary \epoc32\tools\makefile_templates\tools\ant_launch.xml
 binary \epoc32\tools\java\symbianant.jar
@@ -267,12 +271,4 @@
 binary \epoc32\tools\shell\generic.mk
 binary \epoc32\tools\shell\sh.mk
 
-binary \epoc32\include\assp\naviengine\flexible\naviengine.inc
-binary \epoc32\include\assp\naviengine\multiple\naviengine.inc
-binary \epoc32\include\omap_hrp\assp\omap24xx\omap24xxconst.inc
-binary \epoc32\include\omap_hrp\h4\nand_fbr_offset.inc
-binary \epoc32\include\tiomap3\assp\common\customrestartreasons.inc
-binary \epoc32\include\tiomap3\variant\common\nand_fbr_offset.inc
-binary \epoc32\include\wins\nand\nand_fbr_offset.inc
-
 notes_source \component_defs\release.src
--- a/sbsv1_os/e32toolp/kif/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/kif/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/kif/perl/genkif.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/kif/perl/genkif.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makmake/_secure_trgtype.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/_secure_trgtype.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makmake/makdeps.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/makdeps.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makmake/makhelp.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/makhelp.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makmake/makmake.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/makmake.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/makmake/makmake.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/makmake.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 #
@@ -457,7 +457,7 @@
 					@reusedHash = featurevariantmap->CheckOldVmapFile($vmap, \%FeatureVariantInfo);
 				}
 			}
-			if(defined(@reusedHash))
+			if(@reusedHash)
 			{
 				$FeatureVariantInfo{$bld."_LABEL"} = $reusedHash[0];
 				$FeatureVariantInfo{$bld."_FEATURES"} = $reusedHash[1];
@@ -558,7 +558,7 @@
 	$variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".info" if ! -e $MMPFILE;
 # modified by SV end: makefile improvement 
 	my $variant_key = "VARIANT_PLAT_NAME_".&Path_Split('Base', $MMPFILE);
-	$variant_info_new = $variant_info.".tmp";
+	my $variant_info_new = $variant_info.".tmp";
 	open VARIANTINFOR_NEW, ">$variant_info_new" or die "ERROR: Can't open or create file \"$variant_info_new\"\n";
 
 	# Open the variant infor file
--- a/sbsv1_os/e32toolp/makmake/mmp.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/makmake/mmp.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/memtrace/memtrace.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/memtrace/memtrace.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/memtrace/memtrace.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/memtrace/memtrace.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/ARMV5.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/ARMV5.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/GCCE.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/GCCE.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/armutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/armutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/bpabiutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/bpabiutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_arm.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_arm.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_bpabi.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_bpabi.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_codewarrior.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_codewarrior.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_edg.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_edg.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/cl_gcc.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_gcc.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_gccxml.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_gccxml.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/cl_generic.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_generic.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_mingw.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_mingw.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_tools.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_tools.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/cl_vscw.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_vscw.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_win.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_win.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_x86.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_x86.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/cl_x86gcc.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/cl_x86gcc.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/e32plat.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/e32plat.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/e32variant.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/e32variant.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/fcloggerutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/fcloggerutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/filenamepolicyexclusions.txt	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/filenamepolicyexclusions.txt	Sun Mar 14 12:59:11 2010 +0000
@@ -13,6 +13,13 @@
 EGL/egl.h
 EGL/egltypes.h
 EGL/egluids.hrh
+EGL/eglext.h
+WF
+WF/wfc.h
+WF/wfcext.h
+WF/wfcplatform.h
+WF/openwfcuids.hrh
+KHR/khrplatform.h
 GLES
 GLES/egldisplayproperty.h
 GLES/egldisplaypropertydef.h
@@ -57,3 +64,6 @@
 libOpenVG.lib
 libOpenVGU.dll
 libOpenVGU.lib
+libWFC.lib
+libWFC.dll
+libWFCu.def
--- a/sbsv1_os/e32toolp/platform/findimp.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/findimp.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/ide_cw.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/ide_cw.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/ide_vc6.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/ide_vc6.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/lockit_info.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/lockit_info.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/platform/sym_lkup_util.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/sym_lkup_util.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/platform/winutl.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/platform/winutl.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -2,7 +2,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/test/cw_ide_test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/cw_ide_test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/a.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/a.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/b.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/b.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/inc_jack/a.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/inc_jack/a.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/inc_jack/b.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/inc_jack/b.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/inc_noel/a.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/inc_noel/a.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/inc_noel/b.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/inc_noel/b.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/jack.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/jack.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/jack2.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/jack2.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/noel.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/noel.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantmap/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantmap/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/featurevariantparser/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/featurevariantparser/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/test/fixeabidefs.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/fixeabidefs.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/test/mmpscan.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/mmpscan.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/test/unittest.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/test/unittest.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/sbsv1_os/e32toolp/toolinfo/gcce_plat2set.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/toolinfo/gcce_plat2set.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolinfo/rvct_plat2set.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/toolinfo/rvct_plat2set.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolinfo/rvct_ver2set.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/sbsv1_os/e32toolp/toolinfo/rvct_ver2set.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/srcanamdw_os/leavescan/group/Leavescan.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/srcanamdw_os/leavescan/group/Leavescan.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/srcanamdw_os/leavescan/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/srcanamdw_os/leavescan/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/srcanamdw_os/leavescan/source/leavescan.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/srcanamdw_os/leavescan/source/leavescan.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -516,7 +516,7 @@
 		// Valid Block comment, verify that the function name by applying smartfind
 		isvalidlocationforBlock = SmartFind(aFile, aName, blockCommentStartPosn); 
 		if( (isvalidlocationforBlock == string::npos) || // There is no occurrence of name
-			((isvalidlocationforBlock > aStartbraceposn) && (isvalidlocationforBlock != string::npos))) // The name exists but that is inside function block
+			((isvalidlocationforBlock > aStartbraceposn) && (isvalidlocationforBlock != string::npos))) //// The name exists but that is inside function block
 		{
 			return true; 
 		}
--- a/toolsandutils/autotest/Test/th1.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/Test/th1.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -99,4 +99,4 @@
 	__UHEAP_MARKEND;
 	return KErrNone;
     }
-//
+///////////////////////
--- a/toolsandutils/autotest/Test/th1.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/Test/th1.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/autotest/Test/th2.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/Test/th2.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -150,4 +150,4 @@
 	__UHEAP_MARKEND;
 	return KErrNone;
     }
-//
+///////////////////////
--- a/toolsandutils/autotest/Test/th2.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/Test/th2.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/autotest/group/autotest.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/group/autotest.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/autotest/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/autotest/inc/autotest.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/inc/autotest.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -52,8 +52,8 @@
  */
 struct TAutoTestCase
 	{
-	void (*iFunc)(void);   //< function pointer to the actual test case
-	const TText* iText;    //< textual info about the test case
+	void (*iFunc)(void);   ///< function pointer to the actual test case
+	const TText* iText;    ///< textual info about the test case
 	};
 
 static const TInt KMaxCmdLength = 256;
@@ -103,19 +103,19 @@
   private:
 
   private:
-	const struct TAutoTestCase* iTestCases; //< pointer to table with all the test cases
-	const TInt iNumberOfTestcases;			//< number of test cases in the table
-	TBuf<KMaxCmdLength> iTestReportName;	//< holds the name of the test report file
-	TBool iKeepGoing;						//< if true, does not stop if a test fails, but continues
-	TBool iTestSuiteFailed;					//< indicates if the whole test suite failed or not
-	TInt* iTestResults;						//< contains all the test results after running test suite
-	RFs iFileServer;						//< handle to the File Server
-	RFile iTestReport;						//< handle to the file containing the test report
-	TInt iTestCase;							//< the test case currently being run
-	TBuf8<256> iCompInfo;					//< contains information about the Component under test
-	RTest& iRTest;							//< reference to the test utility class
-	TBool* iSkipList;						//< List of tests to be skipped in decimal
-	HBufC* iCommandLine;					//< Internal copy of command line or config file
+	const struct TAutoTestCase* iTestCases; ///< pointer to table with all the test cases
+	const TInt iNumberOfTestcases;			///< number of test cases in the table
+	TBuf<KMaxCmdLength> iTestReportName;	///< holds the name of the test report file
+	TBool iKeepGoing;						///< if true, does not stop if a test fails, but continues
+	TBool iTestSuiteFailed;					///< indicates if the whole test suite failed or not
+	TInt* iTestResults;						///< contains all the test results after running test suite
+	RFs iFileServer;						///< handle to the File Server
+	RFile iTestReport;						///< handle to the file containing the test report
+	TInt iTestCase;							///< the test case currently being run
+	TBuf8<256> iCompInfo;					///< contains information about the Component under test
+	RTest& iRTest;							///< reference to the test utility class
+	TBool* iSkipList;						///< List of tests to be skipped in decimal
+	HBufC* iCommandLine;					///< Internal copy of command line or config file
 	};
 
 //
--- a/toolsandutils/autotest/src/autotest.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/autotest/src/autotest.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-// 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// bld.inf which exports the makefile_templates 
-
-PRJ_EXPORTS
-
-bin/java/symbianant.jar    /epoc32/tools/java/symbianant.jar
-extension/app-services/buildstubsis.meta    /epoc32/tools/makefile_templates/app-services/buildstubsis.meta
-extension/app-services/buildstubsis.mk    /epoc32/tools/makefile_templates/app-services/buildstubsis.mk
-extension/app-services/buildupgradesis.meta    /epoc32/tools/makefile_templates/app-services/buildupgradesis.meta
-extension/app-services/buildupgradesis.mk    /epoc32/tools/makefile_templates/app-services/buildupgradesis.mk
-extension/app-services/tzlocaltestserver.meta    /epoc32/tools/makefile_templates/app-services/tzlocaltestserver.meta
-extension/app-services/tzlocaltestserver.mk    /epoc32/tools/makefile_templates/app-services/tzlocaltestserver.mk
-extension/app-services/wlddatabasekit_sec.meta    /epoc32/tools/makefile_templates/app-services/wlddatabasekit_sec.meta
-extension/app-services/wlddatabasekit_sec.mk    /epoc32/tools/makefile_templates/app-services/wlddatabasekit_sec.mk
-extension/application-protocols/buildstubsis.meta    /epoc32/tools/makefile_templates/application-protocols/buildstubsis.meta
-extension/application-protocols/buildstubsis.mk    /epoc32/tools/makefile_templates/application-protocols/buildstubsis.mk
-extension/base/base_rvct_common.mk    /epoc32/tools/makefile_templates/base/base_rvct_common.mk
-extension/base/bootstrap.meta    /epoc32/tools/makefile_templates/base/bootstrap.meta
-extension/base/bootstrap.mk    /epoc32/tools/makefile_templates/base/bootstrap.mk
-extension/base/config.meta    /epoc32/tools/makefile_templates/base/config.meta
-extension/base/config.mk    /epoc32/tools/makefile_templates/base/config.mk
-extension/base/copy_default.meta    /epoc32/tools/makefile_templates/base/copy_default.meta
-extension/base/copy_default.mk    /epoc32/tools/makefile_templates/base/copy_default.mk
-extension/base/genexec.meta    /epoc32/tools/makefile_templates/base/genexec.meta
-extension/base/genexec.mk    /epoc32/tools/makefile_templates/base/genexec.mk
-extension/base/nand_fbr_offset.meta    /epoc32/tools/makefile_templates/base/nand_fbr_offset.meta
-extension/base/nand_fbr_offset.mk    /epoc32/tools/makefile_templates/base/nand_fbr_offset.mk
-extension/converged-comms/createcommdbs.meta    /epoc32/tools/makefile_templates/converged-comms/createcommdbs.meta
-extension/converged-comms/createcommdbs.mk    /epoc32/tools/makefile_templates/converged-comms/createcommdbs.mk
-extension/converged-comms/installdefaultcommdb.meta    /epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.meta
-extension/converged-comms/installdefaultcommdb.mk    /epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.mk
-extension/graphics/gen_khronos_cpp_from_hdr.meta    /epoc32/tools/makefile_templates/graphics/gen_khronos_cpp_from_hdr.meta
-extension/graphics/gen_khronos_cpp_from_hdr.mk    /epoc32/tools/makefile_templates/graphics/gen_khronos_cpp_from_hdr.mk
-extension/graphics/gen_khronos_openvg_cpp_from_hdr.meta    /epoc32/tools/makefile_templates/graphics/gen_khronos_openvg_cpp_from_hdr.meta
-extension/graphics/gen_khronos_openvg_cpp_from_hdr.mk    /epoc32/tools/makefile_templates/graphics/gen_khronos_openvg_cpp_from_hdr.mk
-extension/graphics/genpdrs.meta    /epoc32/tools/makefile_templates/graphics/genpdrs.meta
-extension/graphics/genpdrs.mk    /epoc32/tools/makefile_templates/graphics/genpdrs.mk
-extension/security/upsserver.meta    /epoc32/tools/makefile_templates/security/upsserver.meta
-extension/security/upsserver.mk    /epoc32/tools/makefile_templates/security/upsserver.mk
-extension/syslibs/conversiontable.meta    /epoc32/tools/makefile_templates/syslibs/conversiontable.meta
-extension/syslibs/conversiontable.mk    /epoc32/tools/makefile_templates/syslibs/conversiontable.mk
-extension/syslibs/fm_copyfile_to_winscw_zdrive.meta    /epoc32/tools/makefile_templates/syslibs/fm_copyfile_to_winscw_zdrive.meta
-extension/syslibs/fm_copyfile_to_winscw_zdrive.mk    /epoc32/tools/makefile_templates/syslibs/fm_copyfile_to_winscw_zdrive.mk
-extension/syslibs/generate_cpp.meta    /epoc32/tools/makefile_templates/syslibs/generate_cpp.meta
-extension/syslibs/generate_cpp.mk    /epoc32/tools/makefile_templates/syslibs/generate_cpp.mk
-extension/syslibs/generate_snm.meta    /epoc32/tools/makefile_templates/syslibs/generate_snm.meta
-extension/syslibs/generate_snm.mk    /epoc32/tools/makefile_templates/syslibs/generate_snm.mk
-extension/syslibs/test/bafl_copytestfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/bafl_copytestfiles.meta
-extension/syslibs/test/bafl_copytestfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/bafl_copytestfiles.mk
-extension/syslibs/test/bafl_resource_files.meta    /epoc32/tools/makefile_templates/syslibs/test/bafl_resource_files.meta
-extension/syslibs/test/bafl_resource_files.mk    /epoc32/tools/makefile_templates/syslibs/test/bafl_resource_files.mk
-extension/syslibs/test/centrep_copydatfile.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copydatfile.meta
-extension/syslibs/test/centrep_copydatfile.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copydatfile.mk
-extension/syslibs/test/centrep_copyfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyfiles.meta
-extension/syslibs/test/centrep_copyfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyfiles.mk
-extension/syslibs/test/centrep_copyfilesv2.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyfilesv2.meta
-extension/syslibs/test/centrep_copyfilesv2.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyfilesv2.mk
-extension/syslibs/test/centrep_copyincentrepsrv.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyincentrepsrv.meta
-extension/syslibs/test/centrep_copyincentrepsrv.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copyincentrepsrv.mk
-extension/syslibs/test/centrep_copypctestfile.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfile.meta
-extension/syslibs/test/centrep_copypctestfile.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfile.mk
-extension/syslibs/test/centrep_copypctestfilev2.meta    /epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfilev2.meta
-extension/syslibs/test/centrep_copypctestfilev2.mk    /epoc32/tools/makefile_templates/syslibs/test/centrep_copypctestfilev2.mk
-extension/syslibs/test/charconv_testpostbuild.meta    /epoc32/tools/makefile_templates/syslibs/test/charconv_testpostbuild.meta
-extension/syslibs/test/charconv_testpostbuild.mk    /epoc32/tools/makefile_templates/syslibs/test/charconv_testpostbuild.mk
-extension/syslibs/test/charconv_tiso8859x_generate_cpp.meta    /epoc32/tools/makefile_templates/syslibs/test/charconv_tiso8859x_generate_cpp.meta
-extension/syslibs/test/charconv_tiso8859x_generate_cpp.mk    /epoc32/tools/makefile_templates/syslibs/test/charconv_tiso8859x_generate_cpp.mk
-extension/syslibs/test/charconv_tsnmdata.meta    /epoc32/tools/makefile_templates/syslibs/test/charconv_tsnmdata.meta
-extension/syslibs/test/charconv_tsnmdata.mk    /epoc32/tools/makefile_templates/syslibs/test/charconv_tsnmdata.mk
-extension/syslibs/test/dbms_copytestdbscfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/dbms_copytestdbscfiles.meta
-extension/syslibs/test/dbms_copytestdbscfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/dbms_copytestdbscfiles.mk
-extension/syslibs/test/ecom3_buildsis.meta    /epoc32/tools/makefile_templates/syslibs/test/ecom3_buildsis.meta
-extension/syslibs/test/ecom3_buildsis.mk    /epoc32/tools/makefile_templates/syslibs/test/ecom3_buildsis.mk
-extension/syslibs/test/ecom3_postbuild.meta    /epoc32/tools/makefile_templates/syslibs/test/ecom3_postbuild.meta
-extension/syslibs/test/ecom3_postbuild.mk    /epoc32/tools/makefile_templates/syslibs/test/ecom3_postbuild.mk
-extension/syslibs/test/ecom3_relocatetarget.meta    /epoc32/tools/makefile_templates/syslibs/test/ecom3_relocatetarget.meta
-extension/syslibs/test/ecom3_relocatetarget.mk    /epoc32/tools/makefile_templates/syslibs/test/ecom3_relocatetarget.mk
-extension/syslibs/test/featmgr_moveplugin.meta    /epoc32/tools/makefile_templates/syslibs/test/featmgr_moveplugin.meta
-extension/syslibs/test/featmgr_moveplugin.mk    /epoc32/tools/makefile_templates/syslibs/test/featmgr_moveplugin.mk
-extension/syslibs/test/logeng_copytestfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/logeng_copytestfiles.meta
-extension/syslibs/test/logeng_copytestfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/logeng_copytestfiles.mk
-extension/syslibs/test/sql_copyperfsqltestfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/sql_copyperfsqltestfiles.meta
-extension/syslibs/test/sql_copyperfsqltestfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/sql_copyperfsqltestfiles.mk
-extension/syslibs/test/sql_copysqltestfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/sql_copysqltestfiles.meta
-extension/syslibs/test/sql_copysqltestfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/sql_copysqltestfiles.mk
-extension/syslibs/test/sqlite3_copysqlite3testfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/sqlite3_copysqlite3testfiles.meta
-extension/syslibs/test/sqlite3_copysqlite3testfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/sqlite3_copysqlite3testfiles.mk
-extension/syslibs/test/sqlite3_securecopytestfiles.meta    /epoc32/tools/makefile_templates/syslibs/test/sqlite3_securecopytestfiles.meta
-extension/syslibs/test/sqlite3_securecopytestfiles.mk    /epoc32/tools/makefile_templates/syslibs/test/sqlite3_securecopytestfiles.mk
-extension/syslibs/test/xml_sitestfiledist.meta    /epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.meta
-extension/syslibs/test/xml_sitestfiledist.mk    /epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.mk
-extension/syslibs/test/xml_stringdictionary00tagtable.meta    /epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.meta
-extension/syslibs/test/xml_stringdictionary00tagtable.mk    /epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.mk
-extension/syslibs/test/xml_syncmltestfiledist.meta    /epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.meta
-extension/syslibs/test/xml_syncmltestfiledist.mk    /epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.mk
-extension/syslibs/test/xml_wmltestfiledist.meta    /epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.meta
-extension/syslibs/test/xml_wmltestfiledist.mk    /epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.mk
-extension/syslibs/test/xml_xmlcmatchdatapostbuild.meta    /epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.meta
-extension/syslibs/test/xml_xmlcmatchdatapostbuild.mk    /epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.mk
-extension/syslibs/word_template.meta    /epoc32/tools/makefile_templates/syslibs/word_template.meta
-extension/syslibs/word_template.mk    /epoc32/tools/makefile_templates/syslibs/word_template.mk
-extension/techview/uiklaf_resource.meta    /epoc32/tools/makefile_templates/techview/uiklaf_resource.meta
-extension/techview/uiklaf_resource.mk    /epoc32/tools/makefile_templates/techview/uiklaf_resource.mk
-extension/tools/ant_launch.meta    /epoc32/tools/makefile_templates/tools/ant_launch.meta
-extension/tools/ant_launch.mk    /epoc32/tools/makefile_templates/tools/ant_launch.mk
-extension/tools/bldex.meta    /epoc32/tools/makefile_templates/tools/bldex.meta
-extension/tools/bldex.mk    /epoc32/tools/makefile_templates/tools/bldex.mk
-extension/tools/compsupp.meta    /epoc32/tools/makefile_templates/tools/compsupp.meta
-extension/tools/compsupp.mk    /epoc32/tools/makefile_templates/tools/compsupp.mk
-extension/tools/features.meta    /epoc32/tools/makefile_templates/tools/features.meta
-extension/tools/features.mk    /epoc32/tools/makefile_templates/tools/features.mk
-extension/tools/jni_ant_launch.meta    /epoc32/tools/makefile_templates/tools/jni_ant_launch.meta
-extension/tools/jni_ant_launch.mk    /epoc32/tools/makefile_templates/tools/jni_ant_launch.mk
-extension/tools/kif.meta    /epoc32/tools/makefile_templates/tools/kif.meta
-extension/tools/kif.mk    /epoc32/tools/makefile_templates/tools/kif.mk
-extension/tools/py2exe.meta    /epoc32/tools/makefile_templates/tools/py2exe.meta
-extension/tools/py2exe.mk    /epoc32/tools/makefile_templates/tools/py2exe.mk
-extension/tools/raptor_linux_dist.meta    /epoc32/tools/makefile_templates/tools/raptor_linux_dist.meta
-extension/tools/raptor_linux_dist.mk    /epoc32/tools/makefile_templates/tools/raptor_linux_dist.mk
-extension/tools/stlport.meta    /epoc32/tools/makefile_templates/tools/stlport.meta
-extension/tools/stlport.mk    /epoc32/tools/makefile_templates/tools/stlport.mk
-extension/tools/x86tool.meta    /epoc32/tools/makefile_templates/tools/x86tool.meta
-extension/tools/x86tool.mk    /epoc32/tools/makefile_templates/tools/x86tool.mk
-extension/tools/ant_launch.flm	/epoc32/tools/makefile_templates/tools/ant_launch.flm
-extension/tools/ant_launch.xml	/epoc32/tools/makefile_templates/tools/ant_launch.xml
-
-shell/cmd.mk    /epoc32/tools/shell/cmd.mk
-shell/generic.mk    /epoc32/tools/shell/generic.mk
-shell/sh.mk    /epoc32/tools/shell/sh.mk
-
-// Extensions specific to on-contributed base ports
-
-//extension/base/h2_genbootinc.meta    /epoc32/tools/makefile_templates/base/h2_genbootinc.meta
-//extension/base/h2_genbootinc.mk    /epoc32/tools/makefile_templates/base/h2_genbootinc.mk
-//extension/base/h2_restricted_coreldr.meta    /epoc32/tools/makefile_templates/base/h2_restricted_coreldr.meta
-//extension/base/h2_restricted_coreldr.mk    /epoc32/tools/makefile_templates/base/h2_restricted_coreldr.mk
-//extension/base/h4_genbootinc.meta    /epoc32/tools/makefile_templates/base/h4_genbootinc.meta
-//extension/base/h4_genbootinc.mk    /epoc32/tools/makefile_templates/base/h4_genbootinc.mk
-//extension/base/h4_restricted_coreldr.meta    /epoc32/tools/makefile_templates/base/h4_restricted_coreldr.meta
-//extension/base/h4_restricted_coreldr.mk    /epoc32/tools/makefile_templates/base/h4_restricted_coreldr.mk
-//extension/base/h4_restricted_on_coreldr.meta    /epoc32/tools/makefile_templates/base/h4_restricted_on_coreldr.meta
-//extension/base/h4_restricted_on_coreldr.mk    /epoc32/tools/makefile_templates/base/h4_restricted_on_coreldr.mk
-//extension/base/h4_restricted_on_miniboot.meta    /epoc32/tools/makefile_templates/base/h4_restricted_on_miniboot.meta
-//extension/base/h4_restricted_on_miniboot.mk    /epoc32/tools/makefile_templates/base/h4_restricted_on_miniboot.mk
-//extension/base/integrator_lmnand2_coreldr.meta    /epoc32/tools/makefile_templates/base/integrator_lmnand2_coreldr.meta
-//extension/base/integrator_lmnand2_coreldr.mk    /epoc32/tools/makefile_templates/base/integrator_lmnand2_coreldr.mk
-//extension/base/integrator_lmnand2_miniboot.meta    /epoc32/tools/makefile_templates/base/integrator_lmnand2_miniboot.meta
-//extension/base/integrator_lmnand2_miniboot.mk    /epoc32/tools/makefile_templates/base/integrator_lmnand2_miniboot.mk
-//extension/base/lab_restricted_miniboot.meta    /epoc32/tools/makefile_templates/base/lab_restricted_miniboot.meta
-//extension/base/lab_restricted_miniboot.mk    /epoc32/tools/makefile_templates/base/lab_restricted_miniboot.mk
-//extension/base/lubbock_coreldr.meta    /epoc32/tools/makefile_templates/base/lubbock_coreldr.meta
-//extension/base/lubbock_coreldr.mk    /epoc32/tools/makefile_templates/base/lubbock_coreldr.mk
-//extension/base/lubbock_miniboot.meta    /epoc32/tools/makefile_templates/base/lubbock_miniboot.meta
-//extension/base/lubbock_miniboot.mk    /epoc32/tools/makefile_templates/base/lubbock_miniboot.mk
-//extension/base/ne1_tb_genbootinc.meta    /epoc32/tools/makefile_templates/base/ne1_tb_genbootinc.meta
-//extension/base/ne1_tb_genbootinc.mk    /epoc32/tools/makefile_templates/base/ne1_tb_genbootinc.mk
-//extension/base/ne1_tb_restricted_coreldr.meta    /epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.meta
-//extension/base/ne1_tb_restricted_coreldr.mk    /epoc32/tools/makefile_templates/base/ne1_tb_restricted_coreldr.mk
-//extension/base/omap3_genbootinc.meta    /epoc32/tools/makefile_templates/base/omap3_genbootinc.meta
-//extension/base/omap3_genbootinc.mk    /epoc32/tools/makefile_templates/base/omap3_genbootinc.mk
-//extension/base/omap3_restricted_coreldr.meta    /epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.meta
-//extension/base/omap3_restricted_coreldr.mk    /epoc32/tools/makefile_templates/base/omap3_restricted_coreldr.mk
--- a/toolsandutils/buildsystem/extension/app-services/buildstubsis.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/app-services/buildstubsis.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/app-services/buildupgradesis.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/app-services/buildupgradesis.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/app-services/tzlocaltestserver.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/app-services/tzlocaltestserver.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/app-services/wlddatabasekit_sec.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/app-services/wlddatabasekit_sec.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/application-protocols/buildstubsis.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/application-protocols/buildstubsis.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/base_rvct_common.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/base_rvct_common.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/config.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/config.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/copy_default.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/copy_default.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/genexec.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/genexec.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/h2_genbootinc.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h2_genbootinc.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/h2_restricted_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h2_restricted_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 #
@@ -61,7 +61,7 @@
 VARIANTINC := $(EXTENSION_ROOT)/../omaph2bsp/h2/inc
 ARMDIR := $(INC_PATH)/kernel/arm
 
-GENINC1 := $(INC_PATH)
+GENINC1 := $(INC_PATH) /epoc32/include
 GENDRIVERINC := $(INC_PATH)/drivers
 GENINC2 := $(INC_PATH)/drivers/unistore2
 H2BLDDIR := $(EXTENSION_ROOT)/../omaph2bsp/h2
--- a/toolsandutils/buildsystem/extension/base/h4_genbootinc.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h4_genbootinc.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/h4_restricted_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h4_restricted_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/h4_restricted_on_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h4_restricted_on_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/h4_restricted_on_miniboot.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/h4_restricted_on_miniboot.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/integrator_lmnand2_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/integrator_lmnand2_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/integrator_lmnand2_miniboot.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/integrator_lmnand2_miniboot.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/lab_restricted_miniboot.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/buildsystem/extension/base/lubbock_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/lubbock_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/lubbock_miniboot.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/lubbock_miniboot.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/nand_fbr_offset.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/nand_fbr_offset.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/ne1_tb_genbootinc.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/ne1_tb_genbootinc.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/ne1_tb_restricted_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 #
@@ -86,7 +86,7 @@
 VARIANTINC3 := $(EXTENSION_ROOT)/../navienginebsp/ne1_tb/nand  $(EXTENSION_ROOT)/../navienginebsp/naviengine_assp  $(INC_PATH)/assp/naviengine/$(MEMMODEL)
 
 #Generic driver file includes
-GENINC1 := $(INC_PATH)
+GENINC1 := $(INC_PATH) $(EPOCROOT)epoc32/include
 GENDRIVERINC := $(INC_PATH)/drivers
 GENINC2 := $(INC_PATH)/drivers/unistore2 $(INC_PATH)/memmodel/epoc $(INC_PATH)/kernel  $(INC_PATH)/kernel/arm $(INC_PATH)/nkern $(INC_PATH)/nkern/arm
 GENXSRINC := $(EXTENSION_ROOT)/../../../kernelhwsrv/kernel/eka/drivers/unistore2/srca/XSR/INC
--- a/toolsandutils/buildsystem/extension/base/omap3_genbootinc.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/omap3_genbootinc.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/base/omap3_restricted_coreldr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/graphics/gen_khronos_cpp_from_hdr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/graphics/gen_khronos_cpp_from_hdr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/graphics/gen_khronos_openvg_cpp_from_hdr.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/graphics/gen_khronos_openvg_cpp_from_hdr.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/graphics/genpdrs.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/graphics/genpdrs.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/security/upsserver.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/security/upsserver.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/conversiontable.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/conversiontable.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/fm_copyfile_to_winscw_zdrive.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/fm_copyfile_to_winscw_zdrive.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/generate_cpp.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/generate_cpp.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/generate_snm.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/generate_snm.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/bafl_copytestfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/bafl_copytestfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/bafl_resource_files.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/bafl_resource_files.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/centrep_copydatfile.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/centrep_copydatfile.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/centrep_copyincentrepsrv.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/centrep_copyincentrepsrv.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfile.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfile.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfilev2.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/centrep_copypctestfilev2.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/charconv_testpostbuild.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/charconv_testpostbuild.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/charconv_tiso8859x_generate_cpp.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/charconv_tiso8859x_generate_cpp.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/charconv_tsnmdata.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/charconv_tsnmdata.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/dbms_copytestdbscfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/dbms_copytestdbscfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/ecom3_buildsis.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/ecom3_buildsis.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/ecom3_postbuild.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/ecom3_postbuild.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/ecom3_relocatetarget.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/ecom3_relocatetarget.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/featmgr_moveplugin.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/featmgr_moveplugin.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/logeng_copytestfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/logeng_copytestfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/sql_copyperfsqltestfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/sql_copyperfsqltestfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/sql_copysqltestfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/sql_copysqltestfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/sqlite3_copysqlite3testfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/sqlite3_copysqlite3testfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/sqlite3_securecopytestfiles.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/sqlite3_securecopytestfiles.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/xml_sitestfiledist.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/xml_sitestfiledist.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/xml_stringdictionary00tagtable.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/xml_stringdictionary00tagtable.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/xml_syncmltestfiledist.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/xml_syncmltestfiledist.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/xml_wmltestfiledist.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/xml_wmltestfiledist.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/test/xml_xmlcmatchdatapostbuild.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/test/xml_xmlcmatchdatapostbuild.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/syslibs/word_template.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/syslibs/word_template.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/techview/uiklaf_resource.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/techview/uiklaf_resource.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 #
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolsandutils/buildsystem/extension/tools/abld_update.meta	Sun Mar 14 12:59:11 2010 +0000
@@ -0,0 +1,9 @@
+# Meta information for stlport builds
+#
+# Copyright (c) 2006 Symbian Software Ltd.  All rights reserved.
+#
+
+platform	win32
+makefile 	gnumake
+techstream	tools
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolsandutils/buildsystem/extension/tools/abld_update.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -0,0 +1,27 @@
+# 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 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.
+#
+# Contributors:
+#
+# Description:
+#
+
+CLEAN:
+	$(TO_BLDINF)\bld.bat clean	
+MAKMAKE:
+	$(TO_BLDINF)\setupprj.bat
+BLD:
+	$(TO_BLDINF)\bld.bat $(CFG)
+RELEASABLES:
+	$(TO_BLDINF)\bld.bat releasables
+LIB SAVESPACE FREEZE CLEANLIB RESOURCE FINAL:
+	@echo $@ does nothing in $(TEMPLATE_EXTENSION_MAKEFILE)
+
+
--- a/toolsandutils/buildsystem/extension/tools/ant_launch.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/ant_launch.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/bldex.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/bldex.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/compsupp.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/compsupp.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/features.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/features.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/jni_ant_launch.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/jni_ant_launch.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/kif.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/kif.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/py2exe.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/py2exe.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/raptor_linux_dist.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/raptor_linux_dist.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/stlport.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/stlport.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/extension/tools/x86tool.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/extension/tools/x86tool.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/shell/cmd.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/shell/cmd.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/shell/generic.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/shell/generic.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/shell/sh.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/shell/sh.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/Bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/Bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/CommonFramework.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/CommonFramework.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/InvariantStaticDLL.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/UseStaticDLL.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/UseStaticDLL.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/UseStaticDLL.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/UseStaticDLL.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/VariantStaticDLL.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/variant_a.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/variant_a.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/variant_a_extra.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/variant_a_extra.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/variant_b.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/variant_b.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/binaryvariation/variant_b_extra.hrh	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/binaryvariation/variant_b_extra.hrh	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/extensions/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/extensions/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/helloworld/Bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/helloworld/Bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/helloworld/CommonFramework.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/helloworld/CommonFramework.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/helloworld/HelloWorld.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/helloworld/HelloWorld.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/helloworld/HelloWorld.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/helloworld/HelloWorld.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/helloworld/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/helloworld/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/test/smoketest.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/test/smoketest.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/tools/buildloggers/group/build.mk	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/tools/buildloggers/group/build.mk	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/tools/buildloggers/src/com/symbian/ant/AbldWhatLogger.java	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/tools/buildloggers/src/com/symbian/ant/AbldWhatLogger.java	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/buildsystem/tools/buildloggers/src/com/symbian/ant/ScanLogger.java	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/buildsystem/tools/buildloggers/src/com/symbian/ant/ScanLogger.java	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/bin2coff/bin2coff.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/bin2coff/bin2coff.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/library/library.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/library/library.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/library/library.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/library/library.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/main.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/main.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/misc/endian.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/misc/endian.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/misc/endian.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/misc/endian.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_file_header.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_file_header.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_file_header.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_file_header.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_string_table.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_string_table.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_string_table.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_string_table.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_symbol.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_symbol.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff/coff_symbol.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff/coff_symbol.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/coff_object.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/coff_object.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_file_header.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_file_header.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_file_header.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_file_header.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_section_header.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_section_header.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_section_header.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_section_header.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_string_table.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_string_table.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_string_table.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_string_table.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_symbol.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_symbol.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf/elf_symbol.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf/elf_symbol.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/elf_object.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/elf_object.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/object.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/object.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/checklib/object/object.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/checklib/object/object.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/compress/byte_pair.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/compress/byte_pair.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -174,7 +174,7 @@
 
         inEnd = in+size;
         outStart = out;
-        //
+        ////////////////
         TInt lastPair = -1;
         TInt b, bb[2], p;
         TInt jj = 0;
@@ -262,7 +262,7 @@
                 }
             }
         }
-        //
+        ////////////////
         ASSERT(!byteCount);
         ASSERT(!pairCount);
         size = out-outStart;
--- a/toolsandutils/e32tools/compress/byte_pair.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/compress/byte_pair.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/compress/pagedcompress.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/compress/pagedcompress.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/compress.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/compress.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/deflate.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/deflate.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/deflate.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/deflate.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/farray.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/farray.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/huffman.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/huffman.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/inflate.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/inflate.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/panic.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/panic.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/deflate/panic.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/deflate/panic.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/e32image/e32image.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/e32image.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/e32image/imgdump.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/imgdump.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/e32image/tr_main.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32image/tr_main.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/e32uid/e32uid.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32uid/e32uid.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/e32uid/uidcrc.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/e32uid/uidcrc.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/group/elf2e32.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/group/elf2e32.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/include/h_ver.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/include/h_ver.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/elf2e32/source/byte_pair.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/byte_pair.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/byte_pair.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/byte_pair.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/checksum.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/checksum.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/checksum.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/checksum.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -27,5 +27,3 @@
 
 #endif // CHECKSUM_H
 
-
-
--- a/toolsandutils/e32tools/elf2e32/source/deffile.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/deffile.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -17,7 +17,7 @@
 // 
 //
 
-//
+///////////////////////////////////////////////////////////
 #include <stdio.h>
 #include <iostream>
 #include <stdlib.h>
--- a/toolsandutils/e32tools/elf2e32/source/deffile.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/deffile.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/deflatecompress.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/deflatecompress.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/dll_fb_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/dll_fb_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/dll_fb_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/dll_fb_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/dll_rebuild_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/dll_rebuild_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/dll_rebuild_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/dll_rebuild_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/e32defwrap.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32defwrap.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -15,7 +15,6 @@
 // warnings.
 // @internalComponent
 // @released
-
 // 
 //
 
@@ -26,8 +25,6 @@
 #undef _L
 #endif
 
-
-
 #include <e32def.h>
 #include <e32def_private.h>
 
--- a/toolsandutils/e32tools/elf2e32/source/e32exporttable.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32exporttable.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/e32exporttable.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32exporttable.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/e32imagedefs.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32imagedefs.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/e32imagefile.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32imagefile.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/e32imagefile.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/e32imagefile.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/elf2e32.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/elf2e32.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/elf2e32.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/elf2e32.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/elffilesupplied.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/elffilesupplied.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/elffilesupplied.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/elffilesupplied.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/errorhandler.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/errorhandler.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/errorhandler.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/errorhandler.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exetarget.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exetarget.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exetarget.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exetarget.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exexp_fb_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exexp_fb_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exexp_fb_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exexp_fb_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exexp_rebuild_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exexp_rebuild_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/exexp_rebuild_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/exexp_rebuild_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_fb_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_fb_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_fb_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_fb_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_rebuild_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_rebuild_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_rebuild_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_rebuild_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/export_type_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/export_type_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/farray.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/farray.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/filedump.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/filedump.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/h_utl.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/h_utl.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/h_utl.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/h_utl.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,17 +1,49 @@
-// 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/// 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 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.
+///
+/// Contributors:
+///
+/// Description:
+/// All rights reserved.
+/// 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.
+/// Contributors:
+/// All rights reserved.
+/// 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.
+/// Contributors:
+/// All rights reserved.
+/// 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.
+/// Contributors:
+/// All rights reserved.
+/// 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.
+/// Contributors:
+///
 
 
  #ifndef __H_UTL_H__
--- a/toolsandutils/e32tools/elf2e32/source/huffman.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/huffman.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/imgdump.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/imgdump.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/inflate.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/inflate.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/inflate.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/inflate.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/librarytarget.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/librarytarget.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/librarytarget.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/librarytarget.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/main.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/main.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -17,7 +17,7 @@
 // 
 //
 
-//
+///////////////////////////////////////////////////////////
 #include "elf2e32.h"
 
 /**
--- a/toolsandutils/e32tools/elf2e32/source/messagehandler.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/messagehandler.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/messagehandler.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/messagehandler.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/messageimplementation.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/messageimplementation.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/messageimplementation.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/messageimplementation.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pagedcompress.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pagedcompress.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/parameterlistinterface.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/parameterlistinterface.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/parameterlistinterface.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/parameterlistinterface.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/parametermanager.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/parametermanager.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/parametermanager.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/parametermanager.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_common.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_common.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_common.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_common.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_dllsymbol.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_dllsymbol.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_dllsymbol.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_dllsymbol.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_dso_handler.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_dso_handler.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_dso_handler.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_dso_handler.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfconsumer.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfconsumer.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfexecutable.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfexecutable.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfexecutable.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfexecutable.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfexports.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfexports.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfexports.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfexports.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfimportrelocation.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfimportrelocation.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfimportrelocation.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfimportrelocation.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfimports.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfimports.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfimports.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfimports.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elflocalrelocation.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elflocalrelocation.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfproducer.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfproducer.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfproducer.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfproducer.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfrelocation.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfrelocation.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfrelocation.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfrelocation.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfrelocations.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfrelocations.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_elfrelocations.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_elfrelocations.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_sym_type.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_sym_type.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_symbol.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_symbol.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/pl_symbol.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/pl_symbol.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/polydll_fb_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/polydll_fb_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -108,5 +108,3 @@
 	WriteE32();
 }
 
-
-
--- a/toolsandutils/e32tools/elf2e32/source/polydll_fb_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/polydll_fb_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/polydll_rebuild_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/polydll_rebuild_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/polydll_rebuild_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/polydll_rebuild_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/staticlibsymbols.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/staticlibsymbols.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/stdexe_target.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/stdexe_target.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/stdexe_target.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/stdexe_target.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/usecasebase.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/usecasebase.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elf2e32/source/usecasebase.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elf2e32/source/usecasebase.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elfdump/elfdump.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elfdump/elfdump.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/def2dll.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/def2dll.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/def2dll.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/def2dll.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/deputil.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/deputil.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/deputil.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/deputil.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/elf2inf.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elf2inf.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/elftran/elf_dlld.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elftran/elf_dlld.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/elftran/elf_file.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elftran/elf_file.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/elftran/elf_imp.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elftran/elf_imp.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/elftools/elftran/elf_reloc.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elftran/elf_reloc.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/elftools/elftran/elf_tran.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/elftran/elf_tran.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/genstubs/genstubs.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/genstubs/genstubs.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/getexports/geninf.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/getexports/geninf.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/getexports/getdirective.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/getexports/getdirective.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/inc/e32ldfmt.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/inc/e32ldfmt.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/inc/elfdefs.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/inc/elfdefs.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/inc/elfdll.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/inc/elfdll.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/inc/elffile.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/inc/elffile.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/elftools/inc/elftran.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/inc/elftran.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/elftools/test/Elftran-test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/elftools/test/Elftran-test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/eruntest/eruntest.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/eruntest/eruntest.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/etouch/etouch.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/etouch/etouch.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/fix_eabi_thunk_offsets/fix_eabi_thunk_offsets.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/fix_eabi_thunk_offsets/fix_eabi_thunk_offsets.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/bin2coff.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/bin2coff.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/checklib.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/checklib.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/elfdump.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/elfdump.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/elftran.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/elftran.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/eruntest.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/eruntest.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/etouch.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/etouch.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/filesystem.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/filesystem.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/genstubs.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/genstubs.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/getdirective.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/getdirective.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/getexports.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/getexports.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/memmap.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/memmap.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/parameterfileprocessor.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/parameterfileprocessor.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/patchdataprocessor.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/patchdataprocessor.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/pediff.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/pediff.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/petran.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/petran.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/readimage.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/readimage.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/readtype.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/readtype.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/rommask.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/rommask.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/secdump.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/secdump.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/seclib.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/seclib.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/sisutils.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/sisutils.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/uidcrc.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/uidcrc.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/w32repro.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/w32repro.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/group/wveconv.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/group/wveconv.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/host/h_file.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/host/h_file.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/host/h_mem.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/host/h_mem.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/host/h_utl.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/host/h_utl.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/inc/e32image.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/e32image.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/inc/h_utl.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/h_utl.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/inc/h_ver.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/h_ver.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/inc/pe_defs.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/pe_defs.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/inc/pe_file.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/pe_file.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/inc/seclib.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/inc/seclib.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/pe_dump/pe_dump.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pe_dump/pe_dump.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/pefile/pe_file.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pefile/pe_file.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/pefile/pe_imp.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pefile/pe_imp.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/pefile/pe_reloc.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pefile/pe_reloc.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/pefile/pe_tran.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pefile/pe_tran.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/pefile/pe_utl.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/pefile/pe_utl.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/e32tools/rombuild/r_build.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/rombuild/r_build.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/rombuild/r_mromimage.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/rombuild/r_mromimage.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/rombuild/r_rom.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/rombuild/r_rom.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/e32tools/seclib/seclib.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/seclib/seclib.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/setcap/setcap.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/setcap/setcap.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/setcap/setcap.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/setcap/setcap.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/tranasm/tranasm.bat	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/tranasm/tranasm.bat	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/tranasm/tranasm.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/tranasm/tranasm.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/tranasm/tranasm_x86.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/tranasm/tranasm_x86.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/e32tools/wveconv/wveconv.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/e32tools/wveconv/wveconv.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/AllKitsRebaseline.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/AllKitsRebaseline.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/BAK/BuildBAK.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BAK/BuildBAK.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -5,7 +5,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/toolsandutils/productionbldtools/BFrC/diffold.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BFrC/diffold.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/BFrC/listdir.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BFrC/listdir.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/BFrC/setold.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BFrC/setold.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/BFrC/testold.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BFrC/testold.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/BuildKit.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/BuildKit.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/CProgressLog.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/CProgressLog.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/InstallSupplementaryKit.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/InstallSupplementaryKit.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/KitStandardLocations.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/KitStandardLocations.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/MakeISOs.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/MakeISOs.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/SupplementalKits.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/SupplementalKits.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/ZipLog2Pkg.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/ZipLog2Pkg.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/compare_kit_content.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/compare_kit_content.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -3,7 +3,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/toolsandutils/productionbldtools/differ.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/differ.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/distillsrc/distillsrc.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/distillsrc/distillsrc.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/distillsrc/distillsrc.pm	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/distillsrc/distillsrc.pm	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/distillsrc/test/test.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/distillsrc/test/test.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/exportipr.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/exportipr.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/productionbldtools/package.pl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/productionbldtools/package.pl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/group/bld.inf	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/group/bld.inf	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -14,33 +14,33 @@
 // PLATFORMS
 //
 
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 PRJ_PLATFORMS
 WINSCW
 
 
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 //
 // EXPORTS
 //
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 PRJ_EXPORTS
 
 
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 //
 // MMPFILES
 //
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 PRJ_MMPFILES
 serialldd
 serialpdd
 
 
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 //
 // TEST MMPFILES
 //
-//
+//////////////////////////////////////////////////////////////////////////////////////////
 PRJ_TESTMMPFILES
 ../testcode/client/wintunnel_test_client.mmp
--- a/toolsandutils/wintunnel/group/ecdrv.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/group/ecdrv.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/group/serialldd.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/group/serialldd.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/group/serialpdd.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/group/serialpdd.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/src_beech/d_cdrv.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_beech/d_cdrv.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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".
 //
@@ -230,9 +230,9 @@
 	}
 
 //VOID WINAPI ReadComplete(DWORD anErr,DWORD numBytes,LPOVERLAPPED anOverLapped)
-//
-// Windows read completion routine
-//
+////
+//// Windows read completion routine
+////
 //	{
 //
 //	if (numBytes>KReadBufSize)
@@ -628,9 +628,9 @@
 */
 
 //void DCommWins::DoReceive(TInt aByteCount)
-//
-// Called from read completion routine 
-//
+////
+//// Called from read completion routine 
+////
 //	{
 //	if(aByteCount==0)
 //		{
@@ -660,11 +660,11 @@
 //		return;
 //		}
 //
-//	if (!ReadFileEx(iCommPort,iInBuf,KReadBufSize,&iReadOverLapped,ReadComplete))
-//		{
-//		TInt r=GetLastError();
-//		Panic(EWindowsUnexpectedError);
-//		}
+////	if (!ReadFileEx(iCommPort,iInBuf,KReadBufSize,&iReadOverLapped,ReadComplete))
+////		{
+////		TInt r=GetLastError();
+////		Panic(EWindowsUnexpectedError);
+////		}
 //	}
 
 void DCommWins::RunCommThread(TDriverCommand aCommand)
--- a/toolsandutils/wintunnel/src_beech/d_comm.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_beech/d_comm.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/wintunnel/src_beech/d_comm.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_beech/d_comm.h	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1995-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/toolsandutils/wintunnel/src_beech/d_comm.inl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_beech/d_comm.inl	Sun Mar 14 12:59:11 2010 +0000
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-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/toolsandutils/wintunnel/src_cedar/serialldd.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_cedar/serialldd.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/src_cedar/serialpdd.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_cedar/serialpdd.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -221,9 +221,9 @@
 	TInt iClientReadLength;		//how much data the client has requested in a read
 
     //-- win tunnel specific members
-	SOCKET  iSocket;        //< socket for serial port simulation
-	char    iOptions[151];  //< contains a string with mapping serial port numbers to the IPs
-    TBool   iReadCancel;    //< flag, used to indicate that the read was cancelled during socket read
+	SOCKET  iSocket;        ///< socket for serial port simulation
+	char    iOptions[151];  ///< contains a string with mapping serial port numbers to the IPs
+    TBool   iReadCancel;    ///< flag, used to indicate that the read was cancelled during socket read
 
 	};
 
--- a/toolsandutils/wintunnel/src_cedar/winscomm.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_cedar/winscomm.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/src_cedar/winscomm.inl	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/src_cedar/winscomm.inl	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/testcode/client/CommonFiles.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/client/CommonFiles.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/testcode/client/wintunnel_test_client.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/client/wintunnel_test_client.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/testcode/client/wintunnel_test_client.mmp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/client/wintunnel_test_client.mmp	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/testcode/server/CTcpServer.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/server/CTcpServer.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -110,9 +110,9 @@
  * SECTION: PRIVATE METHODS
  *
  **************************************************************************************/
-//
+////////////////////////////////////////////////////////////////////////
 //	Method binds the sock to the address. 
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::connect(SOCKET &aSocket, SOCKADDR_IN &aAddr)
 {
 	int err;
@@ -129,9 +129,9 @@
 	return ITS_OK;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 //  Disoconnect
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::disconnect()
 {
 	shutdown(iLocal_Sock, SD_SEND);
@@ -145,9 +145,9 @@
 	return ITS_OK;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 // Method to check if we have IP adress or hostname, and return IP address
-//
+////////////////////////////////////////////////////////////////////////
 SOCKADDR_IN CTcpServer::getSockAddr( const char* aIp, const char* aPort)
 {
 	SOCKADDR_IN sockAddr;
@@ -168,9 +168,9 @@
 }
 
 
-//
+////////////////////////////////////////////////////////////////////////
 // Method to check if the adress is IP format or is a hostname string.
-//
+////////////////////////////////////////////////////////////////////////
 bool CTcpServer::isIPAdress(const char* aAddr)
 {
 	int c =0;
@@ -190,9 +190,9 @@
 		return false;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 // Makes a connection, listens, and prints any incoming data.
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::makeConnection(SOCKET &aLocalSocket, SOCKET &aRemoteSocket, SOCKADDR_IN & aRemoteAddr)
 {
 	int remote_addr_len;
@@ -246,9 +246,9 @@
 	return ITS_OK;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 // Returns a a TCP/IP socket
-//
+////////////////////////////////////////////////////////////////////////
 SOCKET CTcpServer::getSocket()
 {
 	SOCKET sock;
@@ -266,9 +266,9 @@
 	return sock;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 // Initialise use of the dll.
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::initialise()
 {
 	WORD version;
@@ -283,9 +283,9 @@
 }
 
 
-//
+////////////////////////////////////////////////////////////////////////
 // Release.
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::release()
 {
 	int err =WSACleanup();
@@ -296,9 +296,9 @@
 	return ITS_OK;
 }
 
-//
+////////////////////////////////////////////////////////////////////////
 // Set the arguments
-//
+////////////////////////////////////////////////////////////////////////
 int CTcpServer::setArguments(char* li, char* lp)
 {
 	if(!lp)
--- a/toolsandutils/wintunnel/testcode/server/CTcpServer.h	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/server/CTcpServer.h	Sun Mar 14 12:59:11 2010 +0000
@@ -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/toolsandutils/wintunnel/testcode/server/tcp_server.cpp	Mon Mar 08 21:44:30 2010 +0000
+++ b/toolsandutils/wintunnel/testcode/server/tcp_server.cpp	Sun Mar 14 12:59:11 2010 +0000
@@ -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".
 //
@@ -58,9 +58,9 @@
 }
 
 
-//
+////////////////////////////////////////////////////////////////////////
 // Print Usage.
-//
+////////////////////////////////////////////////////////////////////////
 void usage()
 {
 	fprintf( stderr, "tcp_server <local_interface> <local_port>\n" );
FCL/sf/os/buildtools