Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)

Trivial merge