Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 5 Apr 2013 08:59:22 +0000 (12:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Apr 2013 08:59:22 +0000 (12:59 +0400)

Trivial merge