Merge pull request #2566 from krodyush:pullreq/140319-PyrLKOpticalFlow
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 8 Apr 2014 13:58:16 +0000 (17:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 8 Apr 2014 13:58:16 +0000 (17:58 +0400)

Trivial merge