Merge pull request #2822 from timedia:akaze-java
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Jun 2014 10:27:51 +0000 (14:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Jun 2014 10:27:51 +0000 (14:27 +0400)

Trivial merge