Merge pull request #2620 from ilya-lavrenov:ipp_integration
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 23 Apr 2014 11:12:44 +0000 (15:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 23 Apr 2014 11:12:45 +0000 (15:12 +0400)

Trivial merge