Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 10:55:24 +0000 (14:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Nov 2013 10:55:24 +0000 (14:55 +0400)

Trivial merge