merge franks changes with mine RCL_2_0
authortimkelly
Tue, 21 Apr 2009 15:18:56 -0500
branchRCL_2_0
changeset 111 982fd9daebdf
parent 110 57748d5487c8 (current diff)
parent 108 3075fbbc7c5d (diff)
child 113 72a551b82501
merge franks changes with mine
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed