Merge pull request #1106 from pengx17:2.4_gftt_rename
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 11 Jul 2013 07:41:37 +0000 (11:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 11 Jul 2013 07:41:37 +0000 (11:41 +0400)

Trivial merge