Merge pull request #1561 from alalek:ocl_refactoring
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 4 Oct 2013 07:50:03 +0000 (11:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 4 Oct 2013 07:50:03 +0000 (11:50 +0400)

Trivial merge