# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572308 0
# Node ID da1f3efa404b985281e22451d5622d90c658eb4a
# Parent  5529f24b6aaf70f7a770332ea45177b9668107f0# Parent  835a21e50645cdbf91089a2fc72e912bf22bb617
Automatic merge from PDK_3.0.h