# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572311 0
# Node ID d3f4aa43df41a85afd0942a3c7fd04810f0fa8d7
# Parent  a5b0096567da036d4c1eaf8300c2b5994c403425# Parent  4f62049db6ac09f2c99dfb8a65ce79294b763ea6
Automatic merge from PDK_3.0.h