Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 1 Jul 2013 09:20:04 +0000 (13:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 1 Jul 2013 09:20:04 +0000 (13:20 +0400)

Trivial merge