Change-Id: I261bc1ee09a2c22155e4874a4429a868d837c256
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>