Merge pull request #2583 from ilya-lavrenov:ippicv
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Apr 2014 10:14:13 +0000 (14:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Apr 2014 10:14:14 +0000 (14:14 +0400)

Trivial merge