# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572520 0
# Node ID 90de155e514a7f9b1bb0198923eb783401b1de21
# Parent  af140b9029835c009f72bd1846cf2d8c58cba400# Parent  3993b8f65362e82da69366118d89838d1dad5643
Automatic merge from PDK_3.0.h