Merge pull request #380 from asmorkalov:java_test_fix2
authorcuda-geek <marina.kolpakova@itseez.com>
Wed, 30 Jan 2013 15:03:35 +0000 (19:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Jan 2013 15:03:35 +0000 (19:03 +0400)

Trivial merge