Merge pull request #1025 from bitwangyaoyao:2.4_tests
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Jun 2013 08:11:04 +0000 (12:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Jun 2013 08:11:04 +0000 (12:11 +0400)

Trivial merge