Merge pull request #1165 from vpisarev:24_ipp
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 22 Jul 2013 11:34:13 +0000 (15:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 22 Jul 2013 11:34:13 +0000 (15:34 +0400)

Trivial merge