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

Trivial merge