Merge pull request #1910 from alalek:ts_perf_warmuptype
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Dec 2013 09:08:44 +0000 (13:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 09:08:44 +0000 (13:08 +0400)

Trivial merge