Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 29 Nov 2013 15:21:38 +0000 (19:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 29 Nov 2013 15:21:38 +0000 (19:21 +0400)

Trivial merge