Merge pull request #3121 from akarsakov:ocl_dft_opt
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Aug 2014 08:57:53 +0000 (08:57 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Aug 2014 08:57:53 +0000 (08:57 +0000)

Trivial merge