Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 7 Nov 2013 13:29:16 +0000 (17:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 7 Nov 2013 13:29:16 +0000 (17:29 +0400)

Trivial merge