# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572181 0
# Node ID e3fb32198e7710c59062fac856e2d1a497a1cf05
# Parent  1c7b5505b1f1ae704fdcf3c2010d8468e0b4c8e4# Parent  6b87b143d312b730fe10e888d2d3dffa5d6232fa
Automatic merge from PDK_3.0.h