# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277383978 -3600
# Node ID 2fee514510e56ea56f38907a0e4c02c8ec4424ed
# Parent  c4c0b2d3d4ad69a4d9c218674030f2a6e24cd048# Parent  a4d95d2c2540f3c492ea666eceef6002df73586a
Merge heads.

diff -r c4c0b2d3d4ad -r 2fee514510e5 startupservices/SplashScreen/group/bld.inf
diff -r c4c0b2d3d4ad -r 2fee514510e5 startupservices/SplashScreen/src/SplashScreen.cpp