Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 09:42:27 +0000 (18:42 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 8 May 2015 09:42:30 +0000 (18:42 +0900)
Change-Id: If21768f9e48deaec262d0d89e010259585a84fcf
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge