Merge branch 'master' into tizen accepted/tizen/mobile/20150812.110649 accepted/tizen/tv/20150812.110707 accepted/tizen/wearable/20150812.110714 submit/tizen/20150812.063120
authorjoon.c.baek <joon.c.baek@samsung.com>
Wed, 12 Aug 2015 06:30:11 +0000 (15:30 +0900)
committerjoon.c.baek <joon.c.baek@samsung.com>
Wed, 12 Aug 2015 06:30:11 +0000 (15:30 +0900)

Trivial merge