Merge pull request #1507 from pengx17:2.4_fix_test
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 2 Oct 2013 15:52:12 +0000 (19:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Oct 2013 15:52:12 +0000 (19:52 +0400)

Trivial merge