Merge pull request #315 from taka-no-me:java_on
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 15:02:27 +0000 (19:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 23 Jan 2013 15:02:27 +0000 (19:02 +0400)

Trivial merge