Merge tag '3.0-ocl-tech-preview' (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)

Trivial merge