# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572166 0
# Node ID 7d78dc22f3971b1d97534c4d2b7fce8f25dd4122
# Parent  8d6dd3663aadfbdfa688fdb6bb6ea20d6a9867d0# Parent  273b50e1bc69a9474afbcedb398b8e8cfe9cc382
Automatic merge from PDK_3.0.h