Merge branch 'master' into tizen accepted/tizen/common/20160504.130911 accepted/tizen/ivi/20160504.115252 accepted/tizen/mobile/20160504.115116 accepted/tizen/tv/20160504.114935 accepted/tizen/wearable/20160504.115157 submit/tizen/20160504.070438
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 4 May 2016 06:53:20 +0000 (15:53 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 4 May 2016 06:53:20 +0000 (15:53 +0900)

Trivial merge