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


Trivial merge