# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283436467 -3600
# Node ID be583d9baab2edc5faf229021eea3ef3c05df2f1
# Parent  bae7f55f6ef76091cd4abcfdb2e316744154e567# Parent  b5c26a629af88c6800c26716eaea69f61c6bbb65
Merge

diff -r b5c26a629af8 -r be583d9baab2 Version/data/sw.txt
diff -r b5c26a629af8 -r be583d9baab2 deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp
diff -r b5c26a629af8 -r be583d9baab2 foundation_system/system_model/system_definition.xml
diff -r b5c26a629af8 -r be583d9baab2 foundation_system/system_model/system_model.mrp
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/appmngr2/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/audiothemes/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/blid/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/browserui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/btui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/calcsoft/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/calendarui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/cameraapp/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/cbsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/certmanui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/clock2/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/connectionmonitorui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/converter/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/cscapplicationui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/drmsettingsplugin/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/emailhelp/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/equalizer/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/eventsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/fep/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/filemanager/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/fmtx/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/group/bld.inf
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/gssettingsuis/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/homemedia/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/hqtts/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/iaupdate/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/idlehomescreen/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/im/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/imageprintui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/imageviewer/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/imum/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/java/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/landmarksui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/layers.sysdef.xml
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/locationsysui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/logsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/matrixmenu/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mce/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mcsplugin/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mmshui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mmsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mobiledictionary/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/mpxmusicplayer/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/msgmedia/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/notepad/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/omadmappui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/omadsappui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/omaprovisioning/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/operatormenu/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/phonebook/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/phoneui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/photossuite/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/postcard/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/presencesettingsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/profilesapplication/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/psln/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/pushmtm/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/quickoffice/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/radio/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/saplayer/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/satui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/searchui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/secmodui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/smartmessaging/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/smsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/source/en_xml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/speeddial/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/svgtviewerplugin/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/switch5/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/unieditor/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/usbui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/ussd/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/vcommand/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/vmbx/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/voicerec/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/vpnclient/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/wlansniffer/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 helps_loc2/xdmsettingsui/help/data/xhtml.zip
diff -r b5c26a629af8 -r be583d9baab2 layers.sysdef.xml
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/01.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/02.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/03.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/04.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/05.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/06.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/07.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/08.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/09.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/10.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/102.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/103.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/129.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/13.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/14.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/14346.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/14387.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/14412.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/14419.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/15.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/157.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/158.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/159.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/16.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/160.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/161.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/17.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/18.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/230.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/25.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/26.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/27.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/28.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/29.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/30.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/31.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/32.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/326.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/327.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/33.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/37.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/39.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/42.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/44.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/45.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/49.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/50.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/51.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/54.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/57.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/59.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/65.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/67.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/68.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/70.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/76.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/78.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/79.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/83.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/93.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/94.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/data/96.zip
diff -r b5c26a629af8 -r be583d9baab2 locfiles/group/set13/bld.inf
diff -r b5c26a629af8 -r be583d9baab2 locfiles/group/switch_loc.zip
diff -r b5c26a629af8 -r be583d9baab2 package_definition.xml
diff -r b5c26a629af8 -r be583d9baab2 sf_build/sf_prebuild/makefile
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/SF_clientspec.txt
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/platform_paths.hrh
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/ABLD.BAT
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/GTC_MMC_H4.oby
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/GTC_Mature_H4.oby
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/GTC_Mature_H6.oby
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/GTC_Standard_H4.oby
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/GTC_Standard_H6.oby
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/cedarutils/tb92sfrom_obys/reference_roms_tb92.mrp
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/Future/reltools.ini
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb101sf/reltools.ini
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt
diff -r b5c26a629af8 -r be583d9baab2 symbianosbld/productionbldcbrconfig/tb92sf/reltools.ini