# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572264 0
# Node ID fcd6492cb863e6f675fbc0852782c8c6121a176c
# Parent  97b570e6c1f17e631277ccc1f2ddc2fd64b6bfed# Parent  071f3cdcec690cfb801d49d6258ed17eeffbdc10
Automatic merge from PDK_3.0.h

diff -r 97b570e6c1f1 -r fcd6492cb863 imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt
--- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt	Mon Mar 08 21:43:49 2010 +0000
+++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt	Sun Mar 14 13:11:04 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".
 #
diff -r 97b570e6c1f1 -r fcd6492cb863 imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt
--- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Mon Mar 08 21:43:49 2010 +0000
+++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt	Sun Mar 14 13:11:04 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".
 #