# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572592 0
# Node ID 114de25cd3cad6cf28e931de146a44989f1bc6c8
# Parent  72eb3fe718b6e9f8b5e710f29ef981f0dc8a24e3# Parent  0f973a9226e8bed4a1c2474cfd72f8d01e3aa5a2
Automatic merge from PDK_3.0.h