Merge branch 'tizen' into cynara 32/38932/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 30 Apr 2015 14:21:54 +0000 (16:21 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 30 Apr 2015 14:22:05 +0000 (16:22 +0200)
Change-Id: Id45585ce7ff0566779229f240d957f4254071668


Trivial merge