Merge pull request #2582 from vbystricky:ipp_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 8 Apr 2014 10:30:48 +0000 (14:30 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 8 Apr 2014 10:30:48 +0000 (14:30 +0400)

Trivial merge