Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 28 May 2013 18:04:37 +0000 (22:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 28 May 2013 18:04:37 +0000 (22:04 +0400)

Trivial merge