Merge pull request #3394 from akarsakov:ocl_canny
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 7 Nov 2014 12:42:24 +0000 (12:42 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 7 Nov 2014 12:42:24 +0000 (12:42 +0000)

Trivial merge