Merge pull request #1723 from ilya-lavrenov:ocl_norm
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 30 Oct 2013 20:21:28 +0000 (00:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Oct 2013 20:21:29 +0000 (00:21 +0400)

Trivial merge