# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572122 0
# Node ID dd441d7ce963904466541292e56ace8d06e9452d
# Parent  dbb3bf6872873e87aa2388d990447ff9c082c437# Parent  f5911524345e00c77569750a06a738315fd5c610
Automatic merge from PDK_3.0.h