Merged from tizen 2.4
authorKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:47:06 +0000 (09:47 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Wed, 25 Mar 2015 00:47:06 +0000 (09:47 +0900)
Change-Id: I9bb441bdf9d66241f7feab9a53bd438689c4cf3d
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge