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


Trivial merge