# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572103 0
# Node ID 6a42f6e7343665ae7e1de25d0e1cbb4d2e52bafa
# Parent  b78b45177ad9fd322d18a598233b2de8e4e667de# Parent  cc5042a680fb7eb5172cb184db5fdd7ece91af5b
Automatic merge from PDK_3.0.h