Merge branch 'master' into tizen
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 08:40:27 +0000 (17:40 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 08:40:27 +0000 (17:40 +0900)

Trivial merge