# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572153 0
# Node ID 31001cb09df5d4185ed2b9e7036cc9a7b890d1fb
# Parent  1f14f578b347d7e20479bc1a3490ba6198a467b6# Parent  c47a75a8cd72ee66966e252b5213614b74b12300
Automatic merge from PDK_3.0.h