Merge pull request #2440 from codyrigney92:Master_LKOptFlow_NEON
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 5 Mar 2014 13:28:08 +0000 (17:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 5 Mar 2014 13:28:09 +0000 (17:28 +0400)

Trivial merge