# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572182 0
# Node ID f99a5abf9085fb282acefe3da3a46ffd6765b723
# Parent  4881e2c85b9682df38cb0d7744a87b51bf8358fa# Parent  09aa63f9b2bc9ba4aeaafcd0f902d8db89179f1e
Automatic merge from PDK_3.0.h