Merged more code from AnotherOne's Symbian port.
Authored by: plombo 2010-07-01
Parent: [r2846]
Child: [r2848]