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

Trivial merge