Merge pull request #2444 from ilya-lavrenov:tapi_gftt
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 7 Mar 2014 09:53:43 +0000 (13:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 7 Mar 2014 09:53:43 +0000 (13:53 +0400)

Trivial merge