Merge latest codes from tizen 2.4 branch
authorKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:12:24 +0000 (10:12 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Thu, 9 Apr 2015 01:12:24 +0000 (10:12 +0900)
Change-Id: I77aaf768350dccbd334a95814ee2ab4b7e100f25
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge