Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 04:32:48 +0000 (13:32 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 18 May 2015 04:32:52 +0000 (13:32 +0900)
Change-Id: I0cc30beb82b1ab03555d98ceaba73115a6a324ab
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

Trivial merge