Merge branch 'upstream' into tizen accepted/tizen/ivi/20141020.071437 submit/tizen/20141015.143251
authorAlexander Kanavin <alex.kanavin@gmail.com>
Wed, 15 Oct 2014 14:31:01 +0000 (17:31 +0300)
committerAlexander Kanavin <alex.kanavin@gmail.com>
Wed, 15 Oct 2014 14:31:01 +0000 (17:31 +0300)

Trivial merge