Merge branch 'tizen' into cynara 81/38581/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:49:05 +0000 (10:49 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:52:31 +0000 (10:52 +0200)
Change-Id: I8a7de3e8b797c0caf5096de797e896667ea0d3dc


Trivial merge