# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572572 0
# Node ID e6ba5d9eabc10456db0b631a7e230c965548e05c
# Parent  8ee3d1d016597a5fbd4ff9f1ccfee28d251e8b1a# Parent  ea00662efad91077218737dba1ebf5f8c2587612
Automatic merge from PDK_3.0.h