Merged more changes from AnotherOne's Symbian port.
Authored by: plombo 2010-07-01
Parent: [r2845]
Child: [r2847]