Merge pull request #2614 from ilya-lavrenov:ipp_laplacian
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 14 Apr 2014 14:51:30 +0000 (18:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 14 Apr 2014 14:51:31 +0000 (18:51 +0400)

Trivial merge