# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572313 0
# Node ID 8cbe5a532cd08deaa1bd86b3674b3cc511a3d1b4
# Parent  80f6aa5b6805ecbbd5a0ebe9e2236b39d206eea7# Parent  726be5d7e65d814ee3b3489aad9ec119d49f6af6
Automatic merge from PDK_3.0.h