Merge branch 'master' into tizen accepted/tizen/common/20160304.195142 accepted/tizen/ivi/20160305.092014 accepted/tizen/mobile/20160305.091921 accepted/tizen/tv/20160305.091939 accepted/tizen/wearable/20160305.091955 submit/tizen/20160304.011610
authorHyunjin Park <hj.na.park@samsung.com>
Fri, 4 Mar 2016 00:52:58 +0000 (09:52 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Fri, 4 Mar 2016 00:52:58 +0000 (09:52 +0900)

Trivial merge