Merge pull request #595 from bitwangyaoyao:2.4_perfTest
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Mar 2013 08:49:43 +0000 (12:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Mar 2013 08:49:43 +0000 (12:49 +0400)

Trivial merge