Merge pull request #707 from pengx17:2.4_surf
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)

Trivial merge