Merge branch 'tizen' into glesv3 45/16645/1
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Thu, 20 Feb 2014 08:15:56 +0000 (12:15 +0400)
committerStanislav Vorobiov <s.vorobiov@samsung.com>
Thu, 20 Feb 2014 08:21:51 +0000 (12:21 +0400)
Change-Id: I69a1dd3c0cbbea7b7fd19e86e6c726feb785c1cb


Trivial merge