Merging pull request #167 from asmorkalov:java_api_manager_test
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 20 Nov 2012 13:53:06 +0000 (17:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 20 Nov 2012 13:53:06 +0000 (17:53 +0400)

Trivial merge