Merge branch 'remote/s-core/develop' into develop
authorSangho Park <sangho1206.park@samsung.com>
Wed, 28 Jan 2015 07:49:26 +0000 (16:49 +0900)
committerSangho Park <sangho1206.park@samsung.com>
Wed, 28 Jan 2015 07:49:26 +0000 (16:49 +0900)

Trivial merge