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

Trivial merge