# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572223 0
# Node ID d9de229ff167734fa7dd95c607b49b922c78f343
# Parent  17bf63daa97b48cbd851f7d5c96a395a6a8fbf9a# Parent  6a29d5ad0713924ed2d31da7c5d63f11d43f3d9c
Automatic merge from PDK_3.0.h