Merge branch 'upstream' into tizen tizen_3.0_ivi accepted/tizen/ivi/20150114.121038 accepted/tizen/ivi/20160721.002729 submit/tizen/20160720.084010 submit/tizen/20160720.125241 submit/tizen_ivi/20150113.071826 tizen_3.0_ivi_release
authorAlexander Kanavin <alex.kanavin@gmail.com>
Tue, 13 Jan 2015 12:41:49 +0000 (14:41 +0200)
committerAlexander Kanavin <alex.kanavin@gmail.com>
Tue, 13 Jan 2015 12:41:49 +0000 (14:41 +0200)

Trivial merge