Merge pull request #1948 from ilya-lavrenov:tapi_norm
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 9 Dec 2013 09:25:41 +0000 (13:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Dec 2013 09:25:41 +0000 (13:25 +0400)

Trivial merge