Merge pull request #3664 from wangyan42164:ocl_cascasde_barrier
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Feb 2015 15:42:26 +0000 (15:42 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 16 Feb 2015 15:42:26 +0000 (15:42 +0000)

Trivial merge