merge commit
authortimkelly
Fri, 30 Apr 2010 12:41:41 -0500
changeset 1316 25ab7e58dbf7
parent 1315 9d5a1c3cc1cf (current diff)
parent 1314 af4b6a3f5e02 (diff)
child 1317 e49ca0803f82
merge commit
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/brandmark.gif has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/brandmark.gif has changed