Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Oct 2013 11:53:20 +0000 (15:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 7 Oct 2013 11:53:20 +0000 (15:53 +0400)

Trivial merge