# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1275643448 -3600
# Node ID 4177d7e75bb1602d81236fc13582c2d01f55fcca
# Parent  6df133bd92e1ac37f8fb17382b8a08423f6d3b6b# Parent  6bac020dcc51ac0316458aba5979cea0a748c02e
Re-merge docml changes.

diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.xml
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidget.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprofilereader.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetradioserviceclient.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/resources.qrc
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidget.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetplugin.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprofilereader.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetradioserviceclient.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugin_exports_to_rom.pri
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/hswidgetplugin.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/rom/fmradiohswidgetplugin.iby
diff -r 6bac020dcc51 -r 4177d7e75bb1 hswidgetplugin/sis/fmradiohswidgetplugin.pkg
diff -r 6bac020dcc51 -r 4177d7e75bb1 layers.sysdef.xml
diff -r 6bac020dcc51 -r 4177d7e75bb1 radio.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/bin/fmradio_en_US.qm
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/buildflags.pri
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/bwins/radioenginewrapperu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/bwins/radiouiengineu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/bwins/radiowidgetsu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/commoninc/radio_global.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/commoninc/radiologger.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/commoninc/radioservicedef.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/eabi/radioenginewrapperu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/eabi/radiouiengineu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/eabi/radiowidgetsu.def
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapp.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/inc/radioapplication.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/inc/testwindow_win32.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/radioapplication.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/resources/fmradio.ts
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/src/main.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/src/radioapplication.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioapplication/src/testwindow_win32.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/cradioenginehandler.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radiocontroleventlistener.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radioenginewrapper.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radioenginewrapper_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radioenginewrapperobserver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radiosettings.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/radiostationhandlerif.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/inc/t_radiodataparser.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/radioenginewrapper.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/cradioenginehandler.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radioenginewrapper.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radiologger.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radiordslistener.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radioenginewrapper/src/radiosettings.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/inc/radiopresetstorage.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/inc/radiopresetstorage_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/inc/radiopresetstorage_win32_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/inc/radiopresetstorageexport.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/inc/radiostationif.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/radiopresetstorage.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/src/radiopresetstorage.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/src/radiopresetstorage_win32.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiocontrolservice.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiohistoryitem.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiohistoryitem_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiohistorymodel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiohistorymodel_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiomonitorservice.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiomonitorservice_win32.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radioscannerengine.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radioscannerengine_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiostation.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiostation_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiostationfiltermodel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiostationmodel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiostationmodel_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiouiengine.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiouiengine_p.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/inc/radiouiengineexport.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/radiouiengine.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiocontrolservice.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiohistoryitem.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiohistoryitem_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiohistorymodel.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiohistorymodel_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiomonitorservice.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiomonitorservice_win32.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radioscannerengine.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radioscannerengine_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiostation.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiostationfiltermodel.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiostationmodel.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiostationmodel_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiouiengine.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/src/radiouiengine_p.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/tsrc/inc/t_radiostation.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/tsrc/src/t_radiostation.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiouiengine/tsrc/t_radiouiengine.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiobannerlabel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiofadinglabel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiofrequencyitem.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiofrequencyscanner.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiofrequencystrip.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiohistoryview.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiostationcarousel.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiostationitem.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiostationsview.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiostripbase.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiouiutilities.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radioviewbase.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/inc/radiowidgetsexport.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/radiowidgets.pro
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/fmradioui.qrc
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/images/pri_small_star_inactive.svg
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/images/qtg_fr_lcd.svg
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/images/qtg_fr_lcd_overlay.svg
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/images/qtg_fr_tuner.svg
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/images/stripbackground.png
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/layout/radiostationitem.css
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/res/layout/radiostationitem.widgetml
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiobannerlabel.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiofrequencyitem.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiofrequencyscanner.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiofrequencystrip.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiohistoryview.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiostationcarousel.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiostationitem.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiostationsview.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiostripbase.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radiouiutilities.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgets/src/radioviewbase.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioapp/radiowidgetsplugin/main.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/api/mradioengineinitializer.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/api/mradioengineobserver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/api/mradiordsdataobserver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/api/mradiordsreceiver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/group/bld.inf
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/group/radioengine.mmp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/inc/cradioengineimp.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/inc/cradiordsreceiver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/inc/cradiordsreceiverbase.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/inc/t_cradiordsreceiversimulator.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/src/cradioengineimp.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/src/cradionetworkinfolistener.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/src/cradiordsreceiver.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/src/cradiordsreceiverbase.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/engine/src/t_cradiordsreceiversimulator.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/group/buildflags.hrh
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/api/cradioregion.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/api/mradioenginesettings.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/api/mradiosettingssetter.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/group/bld.inf
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/group/radioenginesettings.mmp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/inc/cradioapplicationsettings.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/inc/cradioenginesettings.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/inc/cradiosettingsbase.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/inc/radiosettings.rh
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/src/cradioapplicationsettings.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/src/cradioenginesettings.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/src/cradiosettingsbase.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/settings/src/cradiosettingsimp.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/api/radioenginedef.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/group/bld.inf
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/group/radioengineutils.mmp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/inc/cradioaccessoryobserver.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/inc/cradioremcontargetimp.h
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioaccessoryobserver.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioaudiorouter.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioenginelogger.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioenginetls.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioremcontargetimp.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradioroutableaudio.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradiosystemeventcollector.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradiosystemeventcollectorimp.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/cradiosystemeventdetector.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 radioengine/utils/src/radioengineutils.cpp
diff -r 6bac020dcc51 -r 4177d7e75bb1 rom/fmradio.iby
diff -r 6bac020dcc51 -r 4177d7e75bb1 rom/fmradio_resources.iby