Merge pull request #240 from emchristiansen:javatest2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 14 Jan 2013 07:06:43 +0000 (11:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 14 Jan 2013 07:06:44 +0000 (11:06 +0400)

Trivial merge