Merge pull request #1658 from alalek:ocl_fixes
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 22 Oct 2013 09:46:54 +0000 (13:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Oct 2013 09:46:54 +0000 (13:46 +0400)

Trivial merge