Merge pull request #407 from taka-no-me:fix_java_after_surf_change
authorcuda-geek <marina.kolpakova@itseez.com>
Fri, 1 Feb 2013 13:48:20 +0000 (17:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Feb 2013 13:48:21 +0000 (17:48 +0400)

Trivial merge