Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 24 Mar 2014 06:25:47 +0000 (10:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 06:25:47 +0000 (10:25 +0400)

Trivial merge