Merge "Fix ico-uxf-homescreen/murphy conflict" into tizen rev_0.3
authorRonan Le Martret <ronan@fridu.net>
Mon, 20 Oct 2014 13:55:00 +0000 (06:55 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 20 Oct 2014 13:55:00 +0000 (06:55 -0700)

Trivial merge