Merge pull request #381 from vpisarev:surf_fixes
authorcuda-geek <marina.kolpakova@itseez.com>
Thu, 31 Jan 2013 09:36:09 +0000 (13:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 31 Jan 2013 09:36:10 +0000 (13:36 +0400)

Trivial merge