Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 05:51:14 +0000 (14:51 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 05:51:19 +0000 (14:51 +0900)
Change-Id: I783bb47cc9902ce4365f1dea27994409110008f9
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge