Merge branch 'master' into tizen accepted/tizen/common/20160323.185801 accepted/tizen/ivi/20160324.010913 accepted/tizen/mobile/20160324.010739 accepted/tizen/tv/20160324.010807 accepted/tizen/wearable/20160324.010843 submit/tizen/20160323.130407
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 23 Mar 2016 12:17:50 +0000 (21:17 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 23 Mar 2016 12:17:50 +0000 (21:17 +0900)

Trivial merge