Merge pull request #2609 from alalek:tests_fixes
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 14 Apr 2014 14:54:00 +0000 (18:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 14 Apr 2014 14:54:01 +0000 (18:54 +0400)

Trivial merge