# HG changeset patch
# User timkelly
# Date 1240345136 18000
# Node ID 982fd9daebdf587a8741a68ddeedc3a762515372
# Parent  57748d5487c8a570972e20a9c6751890f8f5f9c9# Parent  3075fbbc7c5d536afa81f18a043db7b628919e3c
merge franks changes with mine

diff -r 57748d5487c8 -r 982fd9daebdf core/com.nokia.carbide.cpp/splash.bmp
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed