Merge pull request #300 from taka-no-me:java_64bit
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 16 Jan 2013 10:49:46 +0000 (14:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 16 Jan 2013 10:49:46 +0000 (14:49 +0400)

Trivial merge