# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572436 0
# Node ID 047299a3352b7b6dcc6e523876e768ddbeaaef1f
# Parent  11ebbc215b05f9c31ba1b9c77533af3ef2ac63d5# Parent  2b6718f05bdb3ee3386dae8f24d6e2b8c2346c57
Automatic merge from PDK_3.0.h