Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 31 Mar 2014 15:36:43 +0000 (19:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 31 Mar 2014 15:36:44 +0000 (19:36 +0400)

Trivial merge