Change-Id: I37cf0f1f5399cd7a4e9900b2cf31b62648bc5370
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>