# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572304 0
# Node ID f6f649aee13ee04654044b64e98bc647a8f0cef2
# Parent  6d6e6d203ea904088d6c4b9f0a0938b1dbf930d1# Parent  fe71b07a6401353b910bcd3f429be9a24909f6c1
Automatic merge from PDK_3.0.h