Change-Id: Idd8cdd01215d648cdb36609f16ca704b08363699
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>