# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572192 0
# Node ID 7e493765a7b84a2020b1a849e2f75d0803d4b531
# Parent  644aeb2c9622b843714f576f5c2d7be0db5f73fd# Parent  d6c1cc3e4806a8b0f27435c311ac0d803c8d334e
Automatic merge from PDK_3.0.h