Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 31 Jul 2014 12:54:13 +0000 (12:54 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 31 Jul 2014 12:54:13 +0000 (12:54 +0000)

Trivial merge