Merge branch 'master' into tizen accepted/tizen/common/20160405.133021 accepted/tizen/ivi/20160405.083920 accepted/tizen/mobile/20160405.083835 accepted/tizen/tv/20160405.083847 accepted/tizen/wearable/20160405.083906 submit/tizen/20160405.071417
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 5 Apr 2016 06:51:43 +0000 (15:51 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 5 Apr 2016 06:51:43 +0000 (15:51 +0900)

Trivial merge