Merge pull request #705 from bitwangyaoyao:2.4_oclFix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)

Trivial merge