Merge pull request #777 from taka-no-me:ocl_win_hang
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 5 Apr 2013 09:00:03 +0000 (13:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Apr 2013 09:00:03 +0000 (13:00 +0400)

Trivial merge