# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572264 0
# Node ID fcd6492cb863e6f675fbc0852782c8c6121a176c
# Parent  97b570e6c1f17e631277ccc1f2ddc2fd64b6bfed# Parent  071f3cdcec690cfb801d49d6258ed17eeffbdc10
Automatic merge from PDK_3.0.h