Merge pull request #742 from bitwangyaoyao:2.4_fix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 11 Apr 2013 07:33:45 +0000 (11:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 11 Apr 2013 07:33:45 +0000 (11:33 +0400)
1  2 
modules/ocl/src/initialization.cpp

Simple merge