# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572314 0
# Node ID f7fdc18fc2719b6e86794552a2421cc6a063ee55
# Parent  8bf2592437557c6343730004329b38a04054eadc# Parent  38249ef85f995ef5f404951e6244f85c73a3eebc
Automatic merge from PDK_3.0.h