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