# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572291 0
# Node ID b2effab6283cb960c6a035a5a8453e94b2d2cad8
# Parent  545dbd3eda3190b71098387e11cb123687d6b9e7# Parent  42de37ce7ce4dc7077e8df8094073122540127fc
Automatic merge from PDK_3.0.h