Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 2 Feb 2015 00:56:25 +0000 (09:56 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 2 Feb 2015 00:56:27 +0000 (09:56 +0900)
Change-Id: I1655dbc3ceabef0300d8e452821bd0d950b9439b


Trivial merge