Merge pull request #1326 from ilya-lavrenov:perf_ocl
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 26 Aug 2013 12:54:59 +0000 (16:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 26 Aug 2013 12:54:59 +0000 (16:54 +0400)

Trivial merge