Merge pull request #2407 from codyrigney92:LKOptFlow_NEON
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 4 Mar 2014 11:30:26 +0000 (15:30 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Mar 2014 11:30:26 +0000 (15:30 +0400)

Trivial merge