Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 22 Jan 2014 14:57:33 +0000 (18:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 22 Jan 2014 14:57:34 +0000 (18:57 +0400)

Trivial merge