# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572119 0
# Node ID c7f00bb26c69df726b7163ffa747ae50558c8696
# Parent  18f29464683c5d77f489ac1ad23940c9d2936985# Parent  ad0f53516d84d7932089d57458ab9f3a97065d85
Automatic merge from PDK_3.0.h