Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 11 Apr 2014 08:43:24 +0000 (12:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 11 Apr 2014 08:43:24 +0000 (12:43 +0400)

Trivial merge