Merge fixes for bug 476, bug 1895, bug 2049, bug 2149, bug 2509, bug 2531 and bug 2539.
REM bldinfo.hbyREMREM Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.REM Build information data filedata=EPOCROOT##epoc32\data\BuildInfo.txt System\Data\BuildInfo.txt