Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 2 Apr 2014 09:01:08 +0000 (13:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Apr 2014 09:01:08 +0000 (13:01 +0400)

Trivial merge