Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:00:05 +0000 (15:00 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 19 Oct 2012 11:00:05 +0000 (15:00 +0400)
1  2 
modules/core/src/parallel.cpp

Simple merge