# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572538 0
# Node ID aeeeb10c4b995b7f470f68f2ea55b69f0c1d275d
# Parent  ef88abca31281d7f7b3826caec82038e8fd3f048# Parent  4e5c952777fc512f8ef3fc8495a9eb5d958d2fd0
Automatic merge from PDK_3.0.h