Merge pull request #2579 from maksqwe:test_operations_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 11 Apr 2014 10:14:33 +0000 (14:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 11 Apr 2014 10:14:33 +0000 (14:14 +0400)

Trivial merge