Merge pull request #2687 from ilya-lavrenov:tapi_norm_inf_234cn
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 6 May 2014 09:27:03 +0000 (13:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 May 2014 09:27:03 +0000 (13:27 +0400)

Trivial merge