Merge pull request #1332 from pengx17:2.4_fix_parallel
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 23 Aug 2013 10:47:48 +0000 (14:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 23 Aug 2013 10:47:49 +0000 (14:47 +0400)

Trivial merge