# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277373727 -3600
# Node ID 3143ae674367d2b17f1e1284395c7e6cef0533e8
# Parent  5ebc046f87781d397acef0da7481626360540bb2# Parent  404b55120d53c2202e7edc7fee650d7033fe3243
Merge heads.

diff -r 5ebc046f8778 -r 3143ae674367 foundation_system/sf_config/cenrep/group/bld.inf
diff -r 5ebc046f8778 -r 3143ae674367 foundation_system/sf_config/cenrep/src/convert.confml
diff -r 5ebc046f8778 -r 3143ae674367 foundation_system/sf_config/cenrep/src/convertpluginlayer/implml/assets.convertprojectml
diff -r 5ebc046f8778 -r 3143ae674367 foundation_system/sf_config/cenrep/src/convertpluginlayer/root.confml