# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572249 0
# Node ID b0106cf14af7174606f39de814853105e5716173
# Parent  4134134ef41841409d3b5ec7d635492deb224b8e# Parent  62c8a2d3d2755d7505b7a378deaf33e5f774d750
Automatic merge from PDK_3.0.h