Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 12 May 2015 06:10:01 +0000 (15:10 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 12 May 2015 06:10:05 +0000 (15:10 +0900)
Change-Id: I1339885f88aef6f8b726260f8c0dfa5de0469be2
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge