Merge latest codes from tizen 2.3 branch
authorKyuho Jo <kyuho.jo@samsung.com>
Wed, 29 Apr 2015 01:51:12 +0000 (10:51 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Wed, 29 Apr 2015 01:51:12 +0000 (10:51 +0900)
Change-Id: I55234839e8531ad0e58c24faba66469c6b0a38c3
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge