Merge pull request #2655 from akarsakov:ipp_fix_pyramid
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 23 Apr 2014 12:27:33 +0000 (16:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 23 Apr 2014 12:27:33 +0000 (16:27 +0400)

Trivial merge