# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1269359903 0
# Node ID d85d729aebdcd8ddd6cb8fc136493b2752b98774
# Parent  8ce2574a29f04295fbf5e801d166ed40b3666aa3# Parent  4b1ead9f948c29a67c9a20983807c14768129e64
Trivial merge to eliminate extra head