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)
commit691ca909d4afd0f79145d760583dfe4756de1411
tree317876005e72a68f73d0155af09602b4ae95e253
parent76b584618506a82cf4467bf14f5986fd2e5d1b47
parentfbd111b7f67e6997eff5f7197a3e31ec97fec34a
Merge branch 'upstream' into tizen