Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 31 Jan 2014 15:22:18 +0000 (19:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 15:22:18 +0000 (19:22 +0400)

Trivial merge