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


Trivial merge