Merge pull request #2600 from ilya-lavrenov:ipp_calc_hist
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 11 Apr 2014 11:18:04 +0000 (15:18 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 11 Apr 2014 11:18:04 +0000 (15:18 +0400)

Trivial merge