Merge pull request #2123 from white-pony:vkysenko/fix-mertens
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 25 Mar 2014 10:37:55 +0000 (14:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 25 Mar 2014 10:37:56 +0000 (14:37 +0400)

Trivial merge