Merge pull request #556 from bitwangyaoyao:2.4_SURF
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 27 Feb 2013 07:37:04 +0000 (11:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Feb 2013 07:37:04 +0000 (11:37 +0400)

Trivial merge