# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572248 0
# Node ID b57f3d42a10e97b0779cd1e9ccc5ee497e87461a
# Parent  05fbbb041e1f2b85950d40d605db25c0d0d084e3# Parent  8ca85d2f0db77f35f45982a37deb4bd5dc3f3df5
Automatic merge from PDK_3.0.h