# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572433 0
# Node ID 8bdeb2d50f7b62d6130b8c3224ab7da67a68da4d
# Parent  28640b20cc44d4b8c3e27327f3267dd04a95bd56# Parent  7bc6ab9b5bcda7f17ae73b51e9820834f81b0a3e
Automatic merge from PDK_3.0.h