# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283439087 -3600
# Node ID 6661d825985909590b1a349efa6049a61241579d
# Parent  1481bf457703c57fcf02a7f1ff7353967f053965# Parent  c027dc8514dad482dbee6ffd0c326f1850ffd2df
Merge RCL_3 fixes with reverted delivery

diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/inc/DRMEncryptorDocument.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/src/DRMEncryptorContainer.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/src/DrmBb5KeyStorage.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/src/DrmEncryptor.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/src/DrmKeyStorage.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmencryptor/src/Performance.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmrightsmanagerui/group/DRMRightsManager.mmp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmrightsmanagerui/inc/DRMRightsMgrDetailsContainer.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmrightsmanagerui/loc/DRMRightsManager.loc
diff -r c027dc8514da -r 6661d8259859 commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsContainer.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/data/drmsettingspluginrsc.rss
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/inc/drmsettingsmodel.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/inc/drmsettingsplugin.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/inc/drmsettingsplugincontainer.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/inc/drmsettingsusagecheckbox.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/src/drmsettingsmodel.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/src/drmsettingsplugin.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/src/drmsettingsplugincontainer.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmsettingsplugin/src/drmsettingsusagecheckbox.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/bwinscw/drmutilitycommonu.def
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/data/drmutility.rss
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/eabi/DrmUtilityDmgrWrapperu.def
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/eabi/drmutilitycommonu.def
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/group/bld.inf
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/group/drmutilitycommon.mmp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/inc/DrmUiHandlingImpl.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/inc/DrmUtilityGlobalNoteWrapper.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/inc/drmutilityui.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/inc/drmutilitywmdrmwrapper.h
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/loc/DRMUtility.loc
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/src/DrmUiHandlingImpl.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/src/DrmUtilityDmgrWrapper.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/src/DrmUtilityGlobalNoteWrapper.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/src/drmutilityui.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp
diff -r c027dc8514da -r 6661d8259859 commondrm/group/bld.inf
diff -r c027dc8514da -r 6661d8259859 commondrm/rom/DRMEncryptor.iby
diff -r c027dc8514da -r 6661d8259859 commondrm/rom/DRMRightsManagerUI.iby
diff -r c027dc8514da -r 6661d8259859 commondrm/rom/DRMRightsManagerUIResources.iby
diff -r c027dc8514da -r 6661d8259859 drm_plat/camese_framework_api/camese_framework_api.metaxml
diff -r c027dc8514da -r 6661d8259859 drm_plat/camese_framework_api/group/bld.inf
diff -r c027dc8514da -r 6661d8259859 drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
diff -r c027dc8514da -r 6661d8259859 drm_plat/drm_rights_api/tsrc/data/c/content.dcf
diff -r c027dc8514da -r 6661d8259859 drm_plat/wmdrm_access_api/inc/wmdrmaccessecominterface.inl
diff -r c027dc8514da -r 6661d8259859 drm_pub/drm_helper_api/inc/Drmhelper.h
diff -r c027dc8514da -r 6661d8259859 drm_pub/drm_helper_api/loc/DRMCommon.loc
diff -r c027dc8514da -r 6661d8259859 drm_pub/oma_drm_caf_agent_api/tsrc/bc/BCDRMCAFCAPS_exe/group/BCDRMCAFCAPS_exe.mmp
diff -r c027dc8514da -r 6661d8259859 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf
diff -r c027dc8514da -r 6661d8259859 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/group/DRM_CAF.mmp
diff -r c027dc8514da -r 6661d8259859 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/group/DRM_CAF_nrm.mmp
diff -r c027dc8514da -r 6661d8259859 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/inc/DRM_CAF.h
diff -r c027dc8514da -r 6661d8259859 inc/DrmUtilityDmgrWrapper.h
diff -r c027dc8514da -r 6661d8259859 layers.sysdef.xml
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/agentv2/src/Oma2AgentAttributes.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/agentv2/src/Oma2AgentManager.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/dcf/src/Oma2Dcf.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/dcfrepository/server/src/DcfRepSrv.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/dm/src/DRMMessageParser.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/drmbackup/inc/DRMBackup.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/drmbackup/src/DRMBackupObserver.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DRMCommon.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DRM_BAT.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmCrypto.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmDcf.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmKeyStorage.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmParsers.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmRights.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmServerInterfaces.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/DrmStdKeyStorage.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/OmaDrmAgent.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/ROAPHandler.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/group/RightsServer.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/keystorage/src/DrmStdKeyStorage.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/legacy/src/DRMCommon.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/legacy/src/drmcommon.rss
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/notifier/inc/DRMMessageStorage.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/notifier/src/DRMMessageStorage.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/notifier/src/DRMNotifierSession.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/ro/src/DrmRightsParser.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/inc/RoapConnection.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/src/RoapConnection.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/src/RoapEng.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/src/RoapEngBase.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/src/RoapHttpHandler.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/roap/src/RoapSigner.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/server/inc/DRMRightsServer.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/server/src/DRMRightsClient.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmengine/server/src/drmrightsdb.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmhelper/group/Drmhelper.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmhelper/group/bld.inf
diff -r c027dc8514da -r 6661d8259859 omadrm/drmhelper/src/drmhelper.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmlicensemanager/group/DRMLicenseManager.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmlicensemanager/group/drm_lm_bat.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmfilter/group/HTTPFilterDRM.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmfilter/src/HTTPFilterDRM.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmfilter/src/HTTPFilterDRMDataSupplier.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrecognizer/group/RecDRM.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrecognizer/src/101F51F4.RSS
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrecognizer/src/RecDRM.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrohandler/group/crohandler.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrohandler/inc/CRoHandler.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrohandler/inc/rohandlerdmgrwrapper.h
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrohandler/src/CRoHandler.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmrohandler/src/rohandlerdmgrwrapper.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmromtm/group/RoMtmDat.mmp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmromtm/loc/RoMtmUi.loc
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmromtm/uiData/inc/RoMtmCommands.hrh
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmromtm/uiData/src/RoMtmDat.cpp
diff -r c027dc8514da -r 6661d8259859 omadrm/drmplugins/drmromtm/uiData/src/RoMtmUi.rss
diff -r c027dc8514da -r 6661d8259859 omadrm/group/bld.inf
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/cameseutility/group/CameseUtility.mmp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/httpfiltercamese/Src/httpfiltercamesedrmheader.cpp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/httpfiltercamese/group/httpfiltercamese.mmp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdla/group/wmdrmdla.mmp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdla/inc/wmdrmdlahttpfwpluginresolver.h
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdlaapp/inc/wmdrmdlabrowsercontainer.h
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdlaapp/inc/wmdrmdlabrowserview.h
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdlaapp/src/wmdrmdlaappservicesession.cpp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp
diff -r c027dc8514da -r 6661d8259859 wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowserview.cpp
diff -r c027dc8514da -r 6661d8259859 wmdrm/wmdrmengine/wmdrmaccess/group/wmdrmaccess.mmp
diff -r c027dc8514da -r 6661d8259859 wmdrm/wmdrmengine/wmdrmaccess/src/wmdrmaccess.cpp
diff -r c027dc8514da -r 6661d8259859 wmdrm/wmdrmengine/wmdrmagent/group/wmdrmagent.mmp