Merge pull request #2493 from ilya-lavrenov:tapi_fnlm
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 19 Mar 2014 08:56:11 +0000 (12:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 19 Mar 2014 08:56:11 +0000 (12:56 +0400)

Trivial merge