# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572576 0
# Node ID 1d3cadb74b5672343da16440ad27efc1d7996528
# Parent  3969f087709d15799761a23e88b3bb9b39ad4026# Parent  030b3432fbe0c829be020829b9bc02002dd572c5
Automatic merge from PDK_3.0.h