Merge remote-tracking branch 'origin/tizen' into glesv3 65/15065/1
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Wed, 15 Jan 2014 08:18:42 +0000 (12:18 +0400)
committerStanislav Vorobiov <s.vorobiov@samsung.com>
Wed, 15 Jan 2014 11:56:25 +0000 (15:56 +0400)
Change-Id: I6562b946475666e4445d0e035da93ffa9351c744


Trivial merge