# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572184 0
# Node ID 388e4eed15bed3860b42f9d855bba35e002f398c
# Parent  7501ce78d4de674d595ac53ead87f16ae3750446# Parent  01d847e5a91bb163d23c015d8521d6211c1c2f71
Automatic merge from PDK_3.0.h