Merge pull request #2160 from SpecLad:norm-assert
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 20 Jan 2014 08:20:21 +0000 (12:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 20 Jan 2014 08:20:21 +0000 (12:20 +0400)

Trivial merge