Merge pull request #2993 from vbystricky:oclopt_warp_affine
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 25 Jul 2014 11:26:24 +0000 (11:26 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 25 Jul 2014 11:26:24 +0000 (11:26 +0000)

Trivial merge