# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572191 0
# Node ID c6ebdf800100df54236cced74ca7f8b44ac61dd1
# Parent  379489e9f43b1a10ac9cd85ffe81f7a0927f2e4d# Parent  35a9006a7fc773f00830995f52a170a79b75f14f
Automatic merge from PDK_3.0.h