Merge pull request #1369 from StevenPuttemans:fix_featuretracker
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 17 Oct 2013 11:42:37 +0000 (15:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 17 Oct 2013 11:42:38 +0000 (15:42 +0400)

Trivial merge