Merge pull request #584 from bitwangyaoyao:2.4_perfTest
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 28 Feb 2013 11:44:06 +0000 (15:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 28 Feb 2013 11:44:06 +0000 (15:44 +0400)

Trivial merge