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

Trivial merge