Merge pull request #223 from taka-no-me:perf_tests
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 12 Dec 2012 14:38:48 +0000 (18:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Dec 2012 14:38:48 +0000 (18:38 +0400)

Trivial merge